Merge commit 'ecf409630c'
* commit 'ecf409630c':
media: i2c: add sc3336p sensor driver
dt-bindings: soc: rockchip-amp: remove CPU_GET_AFFINITY() to dtsi file
ARM: dts: rockchip: add rv1106g-evb2-v12-spi-nand-tb.dts
arm64: dts: rockchip: rk3562-amp: define CPU_GET_AFFINITY
arm64: dts: rockchip: rk3308-amp: define CPU_GET_AFFINITY
soc: rockchip: amp: support init gpio group irqs for amp
irqchip/gicv3: support config amp os irqs
media: rockchip: isp: version v2.5.0
Change-Id: I2e5beffb8875efbbc3736fc3d38770340faabefd
This commit is contained in:
commit
7f72922db0
12 changed files with 2198 additions and 51 deletions
|
|
@ -11,7 +11,7 @@
|
|||
#include <linux/types.h>
|
||||
#include <linux/v4l2-controls.h>
|
||||
|
||||
#define RKISP_API_VERSION KERNEL_VERSION(2, 4, 0)
|
||||
#define RKISP_API_VERSION KERNEL_VERSION(2, 5, 0)
|
||||
|
||||
/****************ISP SUBDEV IOCTL*****************************/
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue