From 9517f982380457dffe284308d835c7ac4d8a16d8 Mon Sep 17 00:00:00 2001 From: yzq Date: Tue, 25 Jun 2013 15:32:41 +0800 Subject: [PATCH] rk610 : support dual lcdc display --- drivers/video/rockchip/transmitter/rk610_lcd.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/video/rockchip/transmitter/rk610_lcd.c b/drivers/video/rockchip/transmitter/rk610_lcd.c index fe58f4422b97..e25058d061e5 100644 --- a/drivers/video/rockchip/transmitter/rk610_lcd.c +++ b/drivers/video/rockchip/transmitter/rk610_lcd.c @@ -79,9 +79,16 @@ static int rk610_output_config(struct i2c_client *client,struct rk29fb_screen *s if(SCREEN_LVDS == screen->type){ if(mode == LCD_OUT_SCL || mode == LCD_OUT_BYPASS){ 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_INPUT_SOURCE(FROM_LCD0_OR_SCL) \ + |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) + c |= LVDS_INPUT_SOURCE(FROM_LCD1); + #else + c |= LVDS_INPUT_SOURCE(FROM_LCD0_OR_SCL); + #endif rk610_scaler_write_p0_reg(client, LVDS_CON0, &c); + c = LCD1_OUT_ENABLE(LCD1_AS_IN); + rk610_scaler_write_p0_reg(client, LCD1_CON, &c); c = LVDS_OUT_ENABLE(0x0) |LVDS_TX_PWR_ENABLE(0x0); rk610_scaler_write_p0_reg(client, LVDS_CON1, &c); } -- 2.34.1