From a7331e0a4a29250f8f999f107108c4af47394690 Mon Sep 17 00:00:00 2001
From: yxj <yxj@rock-chips.com>
Date: Thu, 7 Mar 2013 10:25:01 +0800
Subject: [PATCH] screen:rename LVDS_FORMAT

---
 drivers/video/display/screen/Kconfig                      | 8 ++++++--
 drivers/video/display/screen/Makefile                     | 2 +-
 drivers/video/display/screen/lcd_b101ew05.c               | 4 ++--
 .../screen/{lcd_hsd07pfw1.c => lcd_hdmi_1024x600.c}       | 4 ++--
 drivers/video/display/screen/lcd_hdmi_1024x768.c          | 4 ++--
 drivers/video/display/screen/lcd_hdmi_1280x800.c          | 4 ++--
 6 files changed, 15 insertions(+), 11 deletions(-)
 rename drivers/video/display/screen/{lcd_hsd07pfw1.c => lcd_hdmi_1024x600.c} (99%)
 mode change 100755 => 100644

diff --git a/drivers/video/display/screen/Kconfig b/drivers/video/display/screen/Kconfig
index ef715623e4ab..fe946dda9a04 100755
--- a/drivers/video/display/screen/Kconfig
+++ b/drivers/video/display/screen/Kconfig
@@ -22,8 +22,7 @@ config LCD_RGB_TFT480800_25_E
     bool "RGB TFT480800_25_E"
 config LCD_HSD100PXN
 	  bool "RGB Hannstar HSD100PXN(1024X768)"
-config LCD_HSD07PFW1
-	  bool "RGB Hannstar HSD07PFW1(1024X600)"
+
 config LCD_BYD8688FTGF
 	bool "RGB BYD 1024X600 8688FTGF"
 config LCD_B101AW06
@@ -94,6 +93,11 @@ config LCD_HDMI_1024x768
 	bool "RGB Hannstar LCD_HDMI_1024X768"
 	---help---
 	if support RK610, this setting can support dual screen output
+
+config LCD_HSD07PFW1
+        depends on MFD_RK610
+        bool "RGB Hannstar LCD_HDMI_1024X600"
+
 config LCD_HDMI_800x480
 	depends on MFD_RK610
 	bool "RGB Hannstar LCD_HDMI_800x480"
diff --git a/drivers/video/display/screen/Makefile b/drivers/video/display/screen/Makefile
index a309457c55cf..6bfaed5a8179 100755
--- a/drivers/video/display/screen/Makefile
+++ b/drivers/video/display/screen/Makefile
@@ -47,7 +47,7 @@ obj-$(CONFIG_LCD_COMMON)    += lcd_common.o
 obj-$(CONFIG_LCD_RK2928_A720) += lcd_YQ70CPT9160.o
 obj-$(CONFIG_LCD_RK2926_V86) += lcd_YQ70CPT9160_v86.o
 obj-$(CONFIG_LCD_RK3168_86V) += lcd_YQ70CPT9160_rk3168_86v.o
-obj-$(CONFIG_LCD_HSD07PFW1) += lcd_hsd07pfw1.o
+obj-$(CONFIG_LCD_HSD07PFW1) += lcd_hdmi_1024x600.o
 obj-$(CONFIG_LCD_HJ080NA)    += lcd_hj080na.o
 obj-$(CONFIG_LCD_HJ101NA)   += lcd_hj101na.o
 obj-$(CONFIG_LCD_AUTO)   += lcd_auto.o
diff --git a/drivers/video/display/screen/lcd_b101ew05.c b/drivers/video/display/screen/lcd_b101ew05.c
index 89494ec81df9..327c9caf2918 100755
--- a/drivers/video/display/screen/lcd_b101ew05.c
+++ b/drivers/video/display/screen/lcd_b101ew05.c
@@ -17,7 +17,7 @@
 /* Base */
 #ifdef CONFIG_RK610_LVDS
 #define OUT_TYPE	    	SCREEN_LVDS
-#define OUT_FORMAT      	LVDS_8BIT_2
+#define LVDS_FORMAT      	LVDS_8BIT_2
 #else
 #define OUT_TYPE	    SCREEN_RGB
 #endif
@@ -298,7 +298,7 @@ void set_lcd_info(struct rk29fb_screen *screen, struct rk29lcd_info *lcd_info )
 	screen->face = OUT_FACE;
 	screen->type = OUT_TYPE;
 #ifdef CONFIG_RK610_LVDS
-	screen->hw_format = OUT_FORMAT;
+	screen->hw_format = LVDS_FORMAT;
 #endif
 	
 	/* Screen size */
diff --git a/drivers/video/display/screen/lcd_hsd07pfw1.c b/drivers/video/display/screen/lcd_hdmi_1024x600.c
old mode 100755
new mode 100644
similarity index 99%
rename from drivers/video/display/screen/lcd_hsd07pfw1.c
rename to drivers/video/display/screen/lcd_hdmi_1024x600.c
index c767d58259ba..1560edc61f08
--- a/drivers/video/display/screen/lcd_hsd07pfw1.c
+++ b/drivers/video/display/screen/lcd_hdmi_1024x600.c
@@ -15,7 +15,7 @@
 /* Base */
 #ifdef CONFIG_RK610_LVDS
 #define OUT_TYPE	 SCREEN_LVDS
-#define OUT_FORMAT      	LVDS_8BIT_1
+#define LVDS_FORMAT      	LVDS_8BIT_1
 #else
 #define OUT_TYPE	    SCREEN_RGB
 #endif
@@ -294,7 +294,7 @@ void set_lcd_info(struct rk29fb_screen *screen, struct rk29lcd_info *lcd_info )
     /* screen type & face */
  	screen->type = OUT_TYPE;
 #ifdef CONFIG_RK610_LVDS
-	screen->hw_format = OUT_FORMAT;
+	screen->hw_format = LVDS_FORMAT;
 #endif
 	screen->face = OUT_FACE;
 
diff --git a/drivers/video/display/screen/lcd_hdmi_1024x768.c b/drivers/video/display/screen/lcd_hdmi_1024x768.c
index 9d6f3c933002..fef8148a5451 100644
--- a/drivers/video/display/screen/lcd_hdmi_1024x768.c
+++ b/drivers/video/display/screen/lcd_hdmi_1024x768.c
@@ -14,7 +14,7 @@
 /* Base */
 #define OUT_TYPE		SCREEN_LVDS
 
-#define OUT_FORMAT      LVDS_8BIT_2
+#define LVDS_FORMAT      	LVDS_8BIT_2
 #define OUT_FACE		OUT_D888_P666  
 #define OUT_CLK			65000000
 #define LCDC_ACLK        500000000//312000000           //29 lcdc axi DMA ƵÂÊ
@@ -248,7 +248,7 @@ void set_lcd_info(struct rk29fb_screen *screen,  struct rk29lcd_info *lcd_info )
 	/* screen type & face */
 	screen->type = OUT_TYPE;
 	screen->face = OUT_FACE;
-	screen->hw_format = OUT_FORMAT;
+	screen->hw_format = LVDS_FORMAT;
 
 	/* Screen size */
 	screen->x_res = H_VD;
diff --git a/drivers/video/display/screen/lcd_hdmi_1280x800.c b/drivers/video/display/screen/lcd_hdmi_1280x800.c
index 78eae7b30fb7..e6af99f8ce59 100644
--- a/drivers/video/display/screen/lcd_hdmi_1280x800.c
+++ b/drivers/video/display/screen/lcd_hdmi_1280x800.c
@@ -15,7 +15,7 @@
 /* Base */
 #define OUT_TYPE		SCREEN_LVDS
 
-#define OUT_FORMAT      LVDS_8BIT_2
+#define LVDS_FORMAT      	LVDS_8BIT_2
 
 #define OUT_FACE		OUT_D888_P666  
 #define OUT_CLK			65000000
@@ -251,7 +251,7 @@ void set_lcd_info(struct rk29fb_screen *screen,  struct rk29lcd_info *lcd_info )
 	/* screen type & face */
 	screen->type = OUT_TYPE;
 	screen->face = OUT_FACE;
-	screen->hw_format = OUT_FORMAT;
+	screen->hw_format = LVDS_FORMAT;
 
 	/* Screen size */
 	screen->x_res = H_VD;
-- 
2.34.1