video: rockchip: tve: fix compile error and warning

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

diff --git a/drivers/video/rockchip/lcdc/Kconfig b/drivers/video/rockchip/lcdc/Kconfig
index a714142eabdebeb25b00d27cb5b3f3b8b9366073..9a9ebf490fb713a0ae7106fc070e285c0dfb46f9 100644 (file)
--- a/drivers/video/rockchip/lcdc/Kconfig
+++ b/drivers/video/rockchip/lcdc/Kconfig
@@ -1,91 +1,65 @@
 config LCDC_RK2928
         tristate "rk2928 lcdc support"
-        depends on FB_ROCKCHIP && ARCH_RK2928
+        depends on (DRM_ROCKCHIP || FB_ROCKCHIP) && ARCH_RK2928
         help
           Driver for rk2928 lcdc .
 
 config LCDC_RK30
         tristate "rk30 lcdc support"
-        depends on FB_ROCKCHIP && ARCH_RK30
+        depends on (DRM_ROCKCHIP || FB_ROCKCHIP) && ARCH_RK30XX
         help
           Driver for rk30 lcdc .There are two lcd controllers on rk30
 
-config LCDC0_RK30
-        bool "lcdc0 support"
-        depends on LCDC_RK30
-        default y
-        help
-           Support rk30 lcdc0 if you say y here
-
-config LCDC1_RK30
-        bool "lcdc1 support"
-        depends on LCDC_RK30
-        default y if HDMI_RK30
-        help
-           Support rk30 lcdc1 if you say y here
-
 config LCDC_RK3066B
         tristate "rk3066b lcdc support"
-        depends on FB_ROCKCHIP && ARCH_RK3066B
+        depends on (DRM_ROCKCHIP || FB_ROCKCHIP) && ARCH_RK3066B
         help
           Driver for rk3066b  lcdc.
 
-config LCDC0_RK3066B
-        bool "lcdc0 support"
-        depends on LCDC_RK3066B
-        default y
+config LCDC_RK3188
+        bool "rk3188 lcdc support"
+        depends on DRM_ROCKCHIP || FB_ROCKCHIP 
+       depends on ARM
         help
-           Support lcdc0 if you say y here
+          Driver for rk3188/rk302x/rk319x lcdc.There are two lcd controllers on rk3188
 
-config RK3066B_LCDC0_IO_18V
-        bool "lcdc0 1.8v io support"
-        depends on LCDC0_RK3066B
-        default n
+config LCDC_RK3288
+        bool "rk3288 lcdc support"
+        depends on DRM_ROCKCHIP || FB_ROCKCHIP 
+       depends on ARM
         help
-         LCDC0 io voltage is 1.8V if you say y here,the default voltage is 3.3V
+          Driver for rk3288 lcdc.There are two lcd controllers on rk3288
 
-config LCDC1_RK3066B
-        bool "lcdc1 support"
-        depends on LCDC_RK3066B
-        default n
+config LCDC_RK3036
+       bool "rk3036 lcdc support"
+       depends on DRM_ROCKCHIP || FB_ROCKCHIP 
+       depends on ARM
         help
-           Support lcdc1 if you say y here
+          Driver for rk3036 lcdc.
 
-config RK3066B_LCDC1_IO_18V
-        bool "lcdc1 1.8v io support"
-        depends on LCDC1_RK3066B
-        default n
+config LCDC_RK312X
+        bool "rk312x lcdc support"
+        depends on DRM_ROCKCHIP || FB_ROCKCHIP
+       depends on ARM
         help
-         LCDC1 io voltage is 1.8V if you say y here,the default voltage is 3.3V
+          Driver for rk312x lcdc.
 
-
-config LCDC_RK3188
-        bool "rk3188 lcdc support"
-        depends on FB_ROCKCHIP && ARCH_RK3188
-        help
-          Driver for rk3188 lcdc.There are two lcd controllers on rk3188
-config LCDC0_RK3188
-        bool "lcdc0 support"
-        depends on LCDC_RK3188
-        help
-          Support rk3188 lcdc0 if you say y here
-config LCDC0_IO_18V
-       bool "lcdc0 1.8v io support"
-       depends on LCDC0_RK3188
-       default n
+config LCDC_RK3368
+       bool "rk3368 lcdc support"
+       depends on DRM_ROCKCHIP || FB_ROCKCHIP
+       depends on ARM64
        help
-        LCDC0 io voltage is 1.8V if you say y here,the default voltage is 3.3V
-
-config LCDC1_RK3188
-        bool "lcdc1 support"
-        depends on LCDC_RK3188
-        help
-          Support rk3188 lcdc1 if you say y here
+         Driver for rk3368 lcdc.There are one lcd controllers on rk3368
 
-config LCDC1_IO_18V
-        bool "lcdc1 1.8v io support"
-        depends on LCDC1_RK3188
-       default n
-        help
-         LCDC1 io voltage is 1.8V if you say y here,the default voltage is 3.3V
+config LCDC_RK322X
+       bool "rk322x lcdc support"
+       depends on FB_ROCKCHIP
+       help
+         Driver for rk322x lcdc.There are one lcd controllers on rk322x
 
+config LCDC_LITE_RK3X
+       bool "rk lcdc lite support"
+       depends on FB_ROCKCHIP
+       help
+         Driver for rk lcdc lite.There are one lcd controllers on rk3366 or
+         on other chips in future