Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0-jb

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / Kconfig

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 08120f7a91da75cb1b9e028784b7a340421952e2..ea7897b4ac1b6d8828bd6195f42e4ee9abe50aaf 100755 (executable)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -1194,7 +1194,13 @@ config SIV120B_USER_DEFINED_SERIES
        depends on SOC_CAMERA_SIV120B
        bool "SIV120B user defined init series"
        default n
-
+       
+config SOC_CAMERA_SIV121D
+       tristate "siv121d support for rockchip"
+       depends on SOC_CAMERA && I2C
+       help
+         This is a SIV121D camera driver for rockchip
+         
 config SOC_CAMERA_SID130B
        tristate "sid130b support for rockchip"
        depends on SOC_CAMERA && I2C
@@ -1245,11 +1251,22 @@ config SOC_CAMERA_SP0838
        help
          This is a sp0838 camera driver for rockchip
          
-config S5K5CA_USER_DEFINED_SERIES
+config SP0838_USER_DEFINED_SERIES
        depends on SOC_CAMERA_SP0838
        bool "sp0838 user defined init series"
        default n
 
+config SOC_CAMERA_SP2518
+       tristate "sp2518 camera support for rockchip"
+       depends on SOC_CAMERA && I2C
+       help
+         This is a sp2518 camera driver for rockchip
+         
+config SP2518_USER_DEFINED_SERIES
+       depends on SOC_CAMERA_SP2518
+       bool "sp2518 user defined init series"
+       default n       
+
 
 config SOC_CAMERA_OV9640
        tristate "ov9640 camera support"
@@ -1395,7 +1412,7 @@ endchoice
 
 choice
        prompt "RKXX CIF work simultaneity"
-       depends on VIDEO_RK29
+       depends on VIDEO_RK29 && ARCH_RK30
        default VIDEO_RKCIF_WORK_SIMUL_OFF
        ---help---
                CIFs work simultaneity