HDMI:add hdmi source lcdc select config

diff --git a/drivers/video/rockchip/hdmi/chips/Kconfig b/drivers/video/rockchip/hdmi/chips/Kconfig
index 75786166fdd21a87c141f5f29e6e1a89fda3bd23..589ed9929ad7550ed8d480c5cfecbb0c36b28232 100755 (executable)
--- a/drivers/video/rockchip/hdmi/chips/Kconfig
+++ b/drivers/video/rockchip/hdmi/chips/Kconfig
@@ -28,3 +28,10 @@ if HDMI_RK610
 source "drivers/video/rockchip/hdmi/chips/rk610/Kconfig"
 endif
 
+choice
+       prompt "HDMI Source LCDC select"
+config HDMI_SOURCE_LCDC0
+       bool "lcdc0"
+config HDMI_SOURCE_LCDC1
+       bool "lcdc1"
+endchoice

diff --git a/drivers/video/rockchip/hdmi/chips/rk2928/rk2928_hdmi.h b/drivers/video/rockchip/hdmi/chips/rk2928/rk2928_hdmi.h
index 9efceb36d63bdcb824a558426c97dddbba47d510..6aa9572b668ee6d099d1be9bf79a12fa494fa604 100755 (executable)
--- a/drivers/video/rockchip/hdmi/chips/rk2928/rk2928_hdmi.h
+++ b/drivers/video/rockchip/hdmi/chips/rk2928/rk2928_hdmi.h
@@ -3,7 +3,11 @@
 
 #include "../../rk_hdmi.h"
 
-#define HDMI_SOURCE_DEFAULT            HDMI_SOURCE_LCDC0
+#if defined(CONFIG_HDMI_SOURCE_LCDC1)
+#define HDMI_SOURCE_DEFAULT HDMI_SOURCE_LCDC1
+#else
+#define HDMI_SOURCE_DEFAULT HDMI_SOURCE_LCDC0
+#endif
 
 extern void    rk2928_hdmi_control_output(int enable);
 extern int     rk2928_hdmi_register_hdcp_callbacks(void (*hdcp_cb)(void),

diff --git a/drivers/video/rockchip/hdmi/chips/rk30/rk30_hdmi.h b/drivers/video/rockchip/hdmi/chips/rk30/rk30_hdmi.h
index f0220d0134474d29eb366613b7922efeb3916325..c7c9373878351c74f841202121c11686eff29b1d 100755 (executable)
--- a/drivers/video/rockchip/hdmi/chips/rk30/rk30_hdmi.h
+++ b/drivers/video/rockchip/hdmi/chips/rk30/rk30_hdmi.h
@@ -3,8 +3,11 @@
 
 #include "../../rk_hdmi.h"
 
-/* default HDMI video source */
-#define HDMI_SOURCE_DEFAULT            HDMI_SOURCE_LCDC1
+#if defined(CONFIG_HDMI_SOURCE_LCDC1)
+#define HDMI_SOURCE_DEFAULT HDMI_SOURCE_LCDC1
+#else
+#define HDMI_SOURCE_DEFAULT HDMI_SOURCE_LCDC0
+#endif
 
 extern int rk30_hdmi_register_hdcp_callbacks(void (*hdcp_cb)(void),
                                         void (*hdcp_irq_cb)(int status),

diff --git a/drivers/video/rockchip/hdmi/chips/rk610/rk610_hdmi.h b/drivers/video/rockchip/hdmi/chips/rk610/rk610_hdmi.h
index 26d60b48ae255ad0744ecea0949fc9c754619680..1a652e80702bb16da5840b1775d81bf3cc159aac 100755 (executable)
--- a/drivers/video/rockchip/hdmi/chips/rk610/rk610_hdmi.h
+++ b/drivers/video/rockchip/hdmi/chips/rk610/rk610_hdmi.h
@@ -2,7 +2,7 @@
 #define __RK610_HDMI_H__\r
 #include "../../rk_hdmi.h"\r
 \r
-#if defined(CONFIG_MACH_RK3168_DS1006H) || defined(CONFIG_MACH_RK3188_DS1006H)\r
+#if defined(CONFIG_HDMI_SOURCE_LCDC1)\r
 #define HDMI_SOURCE_DEFAULT HDMI_SOURCE_LCDC1\r
 #else\r
 #define HDMI_SOURCE_DEFAULT HDMI_SOURCE_LCDC0\r