From: yxj <yxj@rock-chips.com>
Date: Wed, 16 Jan 2013 08:04:17 +0000 (+0800)
Subject: move some screen related data structure frome board.h to rk_screen.h
X-Git-Tag: firefly_0821_release~7912
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5353ce10c87d939ad1b3e0e59896c902276fe167;p=firefly-linux-kernel-4.4.55.git

move some screen related data structure frome board.h to rk_screen.h
---

diff --git a/arch/arm/plat-rk/include/plat/board.h b/arch/arm/plat-rk/include/plat/board.h
index fa62daa1411f..a050a320e426 100755
--- a/arch/arm/plat-rk/include/plat/board.h
+++ b/arch/arm/plat-rk/include/plat/board.h
@@ -88,26 +88,6 @@ struct  pmu_info {
 	int          suspend_vol;
 };
 
-struct rk29_fb_setting_info {
-	u8 data_num;
-	u8 vsync_en;
-	u8 den_en;
-	u8 mcu_fmk_en;
-	u8 disp_on_en;
-	u8 standby_en;
-};
-
-struct rk29fb_info {
-	u32 fb_id;
-	enum rk_disp_prop prop;		//display device property,like PRMRY,EXTEND
-	u32 mcu_fmk_pin;
-	struct rk29lcd_info *lcd_info;
-	int (*io_init)(struct rk29_fb_setting_info *fb_setting);
-	int (*io_deinit)(void);
-	int (*io_enable)(void);
-	int (*io_disable)(void);
-	void (*set_screen_info)(struct rk29fb_screen *screen, struct rk29lcd_info *lcd_info );
-};
 
 struct rksdmmc_iomux {
     char    *name;  //set the MACRO of gpio
diff --git a/include/linux/rk_screen.h b/include/linux/rk_screen.h
index 49150827cb88..ef3688cb4201 100644
--- a/include/linux/rk_screen.h
+++ b/include/linux/rk_screen.h
@@ -40,6 +40,15 @@ enum rk_disp_prop{       //display device property
     EXTEND,                        //extend display device ,like hdmi ,tv out
 };
 
+struct rk29_fb_setting_info {
+	u8 data_num;
+	u8 vsync_en;
+	u8 den_en;
+	u8 mcu_fmk_en;
+	u8 disp_on_en;
+	u8 standby_en;
+};
+
 struct rk29lcd_info {
 	u32 lcd_id;
 	u32 txd_pin;
@@ -129,6 +138,18 @@ typedef struct rk29fb_screen {
 	int (*sscreen_set)(struct rk29fb_screen *screen, bool type);// 1: use scaler 0:bypass
 } rk_screen;
 
+struct rk29fb_info {
+	u32 fb_id;
+	enum rk_disp_prop prop;		//display device property,like PRMRY,EXTEND
+	u32 mcu_fmk_pin;
+	struct rk29lcd_info *lcd_info;
+	int (*io_init)(struct rk29_fb_setting_info *fb_setting);
+	int (*io_deinit)(void);
+	int (*io_enable)(void);
+	int (*io_disable)(void);
+	void (*set_screen_info)(struct rk29fb_screen *screen, struct rk29lcd_info *lcd_info );
+};
+
 #ifndef CONFIG_DISPLAY_SUPPORT
 static inline void set_lcd_info(struct rk29fb_screen *screen, struct rk29lcd_info *lcd_info) {}
 #else