From: yzq <yzq@rock-chips.com>
Date: Fri, 25 Jan 2013 03:04:53 +0000 (+0800)
Subject: HDMI:add hdmi source lcdc select config
X-Git-Tag: firefly_0821_release~7788
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=663334b49cb3298bba5b4d1bdfd23a7cdce99bdf;p=firefly-linux-kernel-4.4.55.git

HDMI:add hdmi source lcdc select config
---

diff --git a/drivers/video/rockchip/hdmi/chips/Kconfig b/drivers/video/rockchip/hdmi/chips/Kconfig
index 75786166fdd2..589ed9929ad7 100755
--- 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 9efceb36d63b..6aa9572b668e 100755
--- 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 f0220d013447..c7c937387835 100755
--- 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 26d60b48ae25..1a652e80702b 100755
--- 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__
 #include "../../rk_hdmi.h"
 
-#if defined(CONFIG_MACH_RK3168_DS1006H) || defined(CONFIG_MACH_RK3188_DS1006H)
+#if defined(CONFIG_HDMI_SOURCE_LCDC1)
 #define HDMI_SOURCE_DEFAULT HDMI_SOURCE_LCDC1
 #else
 #define HDMI_SOURCE_DEFAULT HDMI_SOURCE_LCDC0