From: yxj <yxj@rock-chips.com>
Date: Thu, 28 Feb 2013 09:23:25 +0000 (+0800)
Subject: lcdc_hdmi_xxx.c:compatile with new rk fb dual dispaly framework
X-Git-Tag: firefly_0821_release~7499
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e79c575746a60db7aaa3a78c156121dae7be9fee;p=firefly-linux-kernel-4.4.55.git

lcdc_hdmi_xxx.c:compatile with new rk fb dual dispaly framework
---

diff --git a/drivers/video/display/screen/lcd_hdmi_1024x768.c b/drivers/video/display/screen/lcd_hdmi_1024x768.c
index 47124e315fa1..554215328be1 100644
--- a/drivers/video/display/screen/lcd_hdmi_1024x768.c
+++ b/drivers/video/display/screen/lcd_hdmi_1024x768.c
@@ -126,7 +126,8 @@
 /* Other */
 #define DCLK_POL		0
 #define SWAP_RB			0 
-#ifdef  CONFIG_HDMI_DUAL_DISP
+
+#if  ( defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& defined(CONFIG_RK610_LVDS) ) || defined(CONFIG_HDMI_DUAL_DISP)
 static int set_scaler_info(struct rk29fb_screen *screen, u8 hdmi_resolution)
 {
     screen->s_clk_inv = S_DCLK_POL;
diff --git a/drivers/video/display/screen/lcd_hdmi_1280x800.c b/drivers/video/display/screen/lcd_hdmi_1280x800.c
index 969196e4dbda..17b3d44b7bce 100644
--- a/drivers/video/display/screen/lcd_hdmi_1280x800.c
+++ b/drivers/video/display/screen/lcd_hdmi_1280x800.c
@@ -131,7 +131,8 @@
 /* Other */
 #define DCLK_POL		0
 #define SWAP_RB			0 
-#ifdef  CONFIG_HDMI_DUAL_DISP
+
+#if  ( defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& defined(CONFIG_RK610_LVDS) ) || defined(CONFIG_HDMI_DUAL_DISP)
 static int set_scaler_info(struct rk29fb_screen *screen, u8 hdmi_resolution)
 {
     screen->s_clk_inv = S_DCLK_POL;
diff --git a/drivers/video/display/screen/lcd_hdmi_800x480.c b/drivers/video/display/screen/lcd_hdmi_800x480.c
index cf2653c1e9e9..8a374c0ceb6d 100644
--- a/drivers/video/display/screen/lcd_hdmi_800x480.c
+++ b/drivers/video/display/screen/lcd_hdmi_800x480.c
@@ -123,8 +123,10 @@
 
 /* Other */
 #define DCLK_POL		0
-#define SWAP_RB			0 
-#ifdef  CONFIG_HDMI_DUAL_DISP
+#define SWAP_RB			0
+ 
+#if  ( defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& defined(CONFIG_RK610_LVDS) ) || defined(CONFIG_HDMI_DUAL_DISP)
+
 static int set_scaler_info(struct rk29fb_screen *screen, u8 hdmi_resolution)
 {
     screen->s_clk_inv = S_DCLK_POL;