From: yzq <yzq@rock-chips.com>
Date: Mon, 29 Jul 2013 07:52:33 +0000 (+0800)
Subject: rk610 : fix dual screen display err when only use rk610 lvds
X-Git-Tag: firefly_0821_release~6829
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=71be0d5e5ad9650e91bf21fab33dd9caa80a71a7;p=firefly-linux-kernel-4.4.55.git

rk610 : fix dual screen display err when only use rk610 lvds
---

diff --git a/drivers/video/rockchip/transmitter/rk610_lcd.c b/drivers/video/rockchip/transmitter/rk610_lcd.c
index a9da5d153951..333d95ac1daf 100644
--- a/drivers/video/rockchip/transmitter/rk610_lcd.c
+++ b/drivers/video/rockchip/transmitter/rk610_lcd.c
@@ -81,7 +81,7 @@ static int rk610_output_config(struct i2c_client *client,struct rk29fb_screen *s
 		c = LVDS_OUT_CLK_PIN(0) |LVDS_OUT_CLK_PWR_PIN(1) |LVDS_PLL_PWR_PIN(0) \
 		    |LVDS_LANE_IN_FORMAT(DATA_D0_MSB) \
 		    |LVDS_OUTPUT_FORMAT(screen->lvds_format) | LVDS_BIASE_PWR(1); 
-#if defined(CONFIG_DUAL_LCDC_DUAL_DISP_IN_KERNEL)
+#if defined(CONFIG_DUAL_LCDC_DUAL_DISP_IN_KERNEL) && defined(CONFIG_HDMI_RK610)
 		c |=  LVDS_INPUT_SOURCE(FROM_LCD1);
 #else
 		c |=  LVDS_INPUT_SOURCE(FROM_LCD0_OR_SCL);
@@ -96,7 +96,7 @@ static int rk610_output_config(struct i2c_client *client,struct rk29fb_screen *s
 		    c = LVDS_OUT_CLK_PIN(0) |LVDS_OUT_CLK_PWR_PIN(0) |LVDS_PLL_PWR_PIN(1) \
 			|LVDS_LANE_IN_FORMAT(DATA_D0_MSB)  \
 			|LVDS_OUTPUT_FORMAT(screen->lvds_format) | LVDS_BIASE_PWR(0); 
-#if defined(CONFIG_DUAL_LCDC_DUAL_DISP_IN_KERNEL)
+#if defined(CONFIG_DUAL_LCDC_DUAL_DISP_IN_KERNEL) && defined(CONFIG_HDMI_RK610)
 		    c |=  LVDS_INPUT_SOURCE(FROM_LCD1);
 #else
 		    c |=  LVDS_INPUT_SOURCE(FROM_LCD0_OR_SCL);