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 fa62daa1411f5e2a82c56a35303cea0199b31024..a050a320e4268ef091069f3c24c24f1945734fe9 100755 (executable)
--- 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 49150827cb880e5ab9bb04df9954454393fe60f7..ef3688cb4201165562a9e218e3fefb0ab342f317 100644 (file)
--- 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