Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

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

diff --git a/drivers/video/rockchip/hdmi/Kconfig b/drivers/video/rockchip/hdmi/Kconfig
index e3700bbd817d45c7525b7d150ac9529a83fa3147..144b9a51981f36ae6a9524c5e5220b88ab68dac5 100755 (executable)
--- a/drivers/video/rockchip/hdmi/Kconfig
+++ b/drivers/video/rockchip/hdmi/Kconfig
@@ -1,9 +1,22 @@
-menu "RK_HDMI"
-config RK_HDMI
-       bool "RK_HDMI support"
+menuconfig RK_HDMI
+       bool "Rockchip HDMI support"
+       select FB_MODE_HELPERS
        
 if RK_HDMI
 source "drivers/video/rockchip/hdmi/chips/Kconfig"
 endif
 
-endmenu
+config RK_HDMI_DEBUG
+               bool "Rockchip HDMI Debugging"
+        depends on RK_HDMI
+        default n
+               help
+                 Enableds verbose debugging the the HDMI drivers
+
+config RK_HDMI_CTL_CODEC
+               bool "Mute Codec When HDMI Actived"
+               depends on RK_HDMI
+               default n
+               help
+                       If you say y heres, Codec will be mute when hdmi inserted,
+                       and unmute when removed.