rk610 : fix dual screen display err when only use rk610 lvds
authoryzq <yzq@rock-chips.com>
Mon, 29 Jul 2013 07:52:33 +0000 (15:52 +0800)
committeryzq <yzq@rock-chips.com>
Mon, 29 Jul 2013 07:52:33 +0000 (15:52 +0800)
drivers/video/rockchip/transmitter/rk610_lcd.c

index a9da5d1539513a18d0819e2aec6bd9b9a5e79a9d..333d95ac1daf13c53894b59a331947b6b0fd6056 100644 (file)
@@ -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);