rk: board.h: move more define to plat

diff --git a/arch/arm/mach-rk2928/include/mach/board.h b/arch/arm/mach-rk2928/include/mach/board.h
index 303eeb0f0b9e1aea60ca8b27a50d95bfcc66127a..71b354deea87baeb91f80a0a09a12c02d44f3009 100755 (executable)
--- a/arch/arm/mach-rk2928/include/mach/board.h
+++ b/arch/arm/mach-rk2928/include/mach/board.h
@@ -15,96 +15,15 @@
 #define GPIO_SWPORTA_DR  0x0000
 #define GPIO_SWPORTA_DDR 0x0004
 
-extern struct rk29_sdmmc_platform_data default_sdmmc0_data;
-extern struct rk29_sdmmc_platform_data default_sdmmc1_data;
-
-extern struct i2c_gpio_platform_data default_i2c_gpio_data; 
-
 void __init rk2928_map_common_io(void);
 void __init rk2928_init_irq(void);
 void __init rk2928_map_io(void);
 struct machine_desc;
 void __init rk2928_fixup(struct machine_desc *desc, struct tag *tags, char **cmdline, struct meminfo *mi);
 void __init rk2928_clock_data_init(unsigned long gpll,unsigned long cpll,u32 flags);
-void __init board_clock_init(void);
 void __init rk2928_iomux_init(void);
-void board_gpio_suspend(void);
-void board_gpio_resume(void);
-void __sramfunc board_pmu_suspend(void);
-void __sramfunc board_pmu_resume(void);
-
 extern struct sys_timer rk2928_timer;
 
-struct ts_hw_data {
-       int reset_gpio;
-       int touch_en_gpio;
-};
-
-#ifndef _LINUX_WLAN_PLAT_H_
-struct wifi_platform_data {
-        int (*set_power)(int val);
-        int (*set_reset)(int val);
-        int (*set_carddetect)(int val);
-        void *(*mem_prealloc)(int section, unsigned long size);
-        int (*get_mac_addr)(unsigned char *buf);
-};
-#endif
-#if defined (CONFIG_EETI_EGALAX)
-struct eeti_egalax_platform_data{
-       u16     model;
-
-    int     (*get_pendown_state)(void);
-    int     (*init_platform_hw)(void);
-    int     (*eeti_egalax_platform_sleep)(void);
-    int     (*eeti_egalax_platform_wakeup)(void);
-    void    (*exit_platform_hw)(void);
-    int     standby_pin;
-    int     standby_value;
-    int     disp_on_pin;
-    int     disp_on_value;
- 
-};
-#endif
-#if defined (CONFIG_TOUCHSCREEN_SITRONIX_A720)
-struct ft5x0x_platform_data{
-         u16     model;
-    int     (*get_pendown_state)(void);
-    int     (*init_platform_hw)(void);
-    int     (*ft5x0x_platform_sleep)(void);
-    int     (*ft5x0x_platform_wakeup)(void);
-    void    (*exit_platform_hw)(void);
-    int     (*direction_otation)(int *x ,int *y );
-};
-#endif
-
-#if defined (CONFIG_TOUCHSCREEN_I30)
-struct ft5306_platform_data {
-    int rest_pin;
-    int irq_pin ;
-    int     (*get_pendown_state)(void);
-    int     (*init_platform_hw)(void);
-    int     (*platform_sleep)(void);
-    int     (*platform_wakeup)(void);
-    void    (*exit_platform_hw)(void);
-};
-#endif
-#if defined(CONFIG_TOUCHSCREEN_BYD693X)
-struct byd_platform_data {
-       u16     model;
-       int     pwr_pin;
-       int       int_pin;
-       int     rst_pin;
-       int             pwr_on_value;
-       int     *tp_flag;
-
-       uint16_t screen_max_x;
-       uint16_t screen_max_y;
-       u8 swap_xy :1;
-       u8 xpol :1;
-       u8 ypol :1;     
-};
-#endif
-
 enum _periph_pll {
        periph_pll_1485mhz = 148500000,
        periph_pll_297mhz = 297000000,

diff --git a/arch/arm/mach-rk30/include/mach/board.h b/arch/arm/mach-rk30/include/mach/board.h
index ca047030cf04604c3e0d88dc0c30657519c15b92..294f021625c919cf3cc8c24abac5bb2be32b2f99 100644 (file)
--- a/arch/arm/mach-rk30/include/mach/board.h
+++ b/arch/arm/mach-rk30/include/mach/board.h
@@ -12,68 +12,6 @@
 #include <mach/sram.h>
 #include <linux/i2c-gpio.h>
 
-#ifndef _LINUX_WLAN_PLAT_H_
-struct wifi_platform_data {
-        int (*set_power)(int val);
-        int (*set_reset)(int val);
-        int (*set_carddetect)(int val);
-        void *(*mem_prealloc)(int section, unsigned long size);
-        int (*get_mac_addr)(unsigned char *buf);
-};
-#endif
-
-#if defined (CONFIG_TOUCHSCREEN_FT5306)
-struct ft5x0x_platform_data{
-       u16     model;
-       int     max_x;
-       int     max_y;
-       int     key_min_x;
-       int     key_min_y;
-       int     xy_swap;
-       int     x_revert;
-       int     y_revert;
-       int     (*get_pendown_state)(void);
-       int     (*init_platform_hw)(void);
-       int     (*ft5x0x_platform_sleep)(void);
-       int     (*ft5x0x_platform_wakeup)(void);  
-       void    (*exit_platform_hw)(void);
-
-};
-#endif
-
-#if defined (CONFIG_TOUCHSCREEN_FT5306_WPX2)
-struct ft5x0x_platform_data{
-          u16     model;
-    int     (*get_pendown_state)(void);
-    int     (*init_platform_hw)(void);
-    int     (*ft5x0x_platform_sleep)(void);
-    int     (*ft5x0x_platform_wakeup)(void);
-    void    (*exit_platform_hw)(void);
-};
-#endif
-
-struct codec_io_info{
-       char    iomux_name[50];
-       int             iomux_mode;     
-};
-
-struct rt3261_platform_data{
-       unsigned int codec_en_gpio;
-       struct codec_io_info codec_en_gpio_info;
-       int (*io_init)(int, char *, int);
-       unsigned int spk_num;
-       unsigned int modem_input_mode;
-       unsigned int lout_to_modem_mode;
-       unsigned int spk_amplify;
-       unsigned int playback_if1_data_control;
-       unsigned int playback_if2_data_control;
-};
-
-extern struct rk29_sdmmc_platform_data default_sdmmc0_data;
-extern struct rk29_sdmmc_platform_data default_sdmmc1_data;
-
-extern struct i2c_gpio_platform_data default_i2c_gpio_data; 
-extern struct rk29_vmac_platform_data board_vmac_data;
 
 void __init rk30_map_common_io(void);
 void __init rk30_init_irq(void);
@@ -81,11 +19,6 @@ void __init rk30_map_io(void);
 struct machine_desc;
 void __init rk30_fixup(struct machine_desc *desc, struct tag *tags, char **cmdline, struct meminfo *mi);
 void __init rk30_clock_data_init(unsigned long gpll,unsigned long cpll,u32 flags);
-void __init board_clock_init(void);
-void board_gpio_suspend(void);
-void board_gpio_resume(void);
-void __sramfunc board_pmu_suspend(void);
-void __sramfunc board_pmu_resume(void);
 
 #ifdef CONFIG_RK30_PWM_REGULATOR
 void  rk30_pwm_suspend_voltage_set(void);

diff --git a/arch/arm/plat-rk/include/plat/board.h b/arch/arm/plat-rk/include/plat/board.h
index 072a94361402d0374b95714c7b1793de52e18235..4da0fe24488150bf7ad1fcde9fabd2a2174c5bb5 100755 (executable)
--- a/arch/arm/plat-rk/include/plat/board.h
+++ b/arch/arm/plat-rk/include/plat/board.h
@@ -185,14 +185,6 @@ struct gsensor_platform_data {
        void (*exit_platform_hw)(void);
 };
 
-struct ft5606_platform_data {
-    int     (*get_pendown_state)(void);
-    int     (*init_platform_hw)(void);
-    int     (*platform_sleep)(void);
-    int     (*platform_wakeup)(void);
-    void    (*exit_platform_hw)(void);
-};
-
 struct akm8975_platform_data {
        short m_layout[4][3][3];
        char project_name[64];
@@ -229,28 +221,6 @@ struct board_id_platform_data {
        int (*init_parameter)(int id);  
 };
 
-
-
-struct goodix_platform_data {
-       int model ;
-       int rest_pin;
-       int irq_pin ;
-       int (*get_pendown_state)(void);
-       int (*init_platform_hw)(void);
-       int (*platform_sleep)(void);
-       int (*platform_wakeup)(void);
-       void (*exit_platform_hw)(void);
-};
-
-struct ct360_platform_data {
-       u16             model;
-       u16             x_max;
-       u16             y_max;
-       void    (*hw_init)(void);
-       void    (*shutdown)(int);
-};
-
-
 struct cm3217_platform_data {
        int irq_pin;
        int power_pin;
@@ -337,6 +307,139 @@ struct rk30_adc_battery_platform_data {
 
 };
 
+#ifndef _LINUX_WLAN_PLAT_H_
+struct wifi_platform_data {
+        int (*set_power)(int val);
+        int (*set_reset)(int val);
+        int (*set_carddetect)(int val);
+        void *(*mem_prealloc)(int section, unsigned long size);
+        int (*get_mac_addr)(unsigned char *buf);
+};
+#endif
+
+struct goodix_platform_data {
+       int model ;
+       int rest_pin;
+       int irq_pin ;
+       int (*get_pendown_state)(void);
+       int (*init_platform_hw)(void);
+       int (*platform_sleep)(void);
+       int (*platform_wakeup)(void);
+       void (*exit_platform_hw)(void);
+};
+
+struct ct360_platform_data {
+       u16             model;
+       u16             x_max;
+       u16             y_max;
+       void    (*hw_init)(void);
+       void    (*shutdown)(int);
+};
+
+struct ft5606_platform_data {
+    int     (*get_pendown_state)(void);
+    int     (*init_platform_hw)(void);
+    int     (*platform_sleep)(void);
+    int     (*platform_wakeup)(void);
+    void    (*exit_platform_hw)(void);
+};
+
+#if defined(CONFIG_TOUCHSCREEN_FT5306) || defined(CONFIG_TOUCHSCREEN_FT5306_WPX2)
+struct ft5x0x_platform_data{
+       u16     model;
+       int     max_x;
+       int     max_y;
+       int     key_min_x;
+       int     key_min_y;
+       int     xy_swap;
+       int     x_revert;
+       int     y_revert;
+       int     (*get_pendown_state)(void);
+       int     (*init_platform_hw)(void);
+       int     (*ft5x0x_platform_sleep)(void);
+       int     (*ft5x0x_platform_wakeup)(void);
+       void    (*exit_platform_hw)(void);
+};
+#endif
+
+#if defined (CONFIG_TOUCHSCREEN_SITRONIX_A720)
+struct ft5x0x_platform_data{
+    u16     model;
+    int     (*get_pendown_state)(void);
+    int     (*init_platform_hw)(void);
+    int     (*ft5x0x_platform_sleep)(void);
+    int     (*ft5x0x_platform_wakeup)(void);
+    void    (*exit_platform_hw)(void);
+    int     (*direction_otation)(int *x ,int *y );
+};
+#endif
+
+#if defined (CONFIG_TOUCHSCREEN_I30)
+struct ft5306_platform_data {
+    int     rest_pin;
+    int     irq_pin;
+    int     (*get_pendown_state)(void);
+    int     (*init_platform_hw)(void);
+    int     (*platform_sleep)(void);
+    int     (*platform_wakeup)(void);
+    void    (*exit_platform_hw)(void);
+};
+#endif
+
+#if defined (CONFIG_EETI_EGALAX)
+struct eeti_egalax_platform_data {
+    u16     model;
+    int     (*get_pendown_state)(void);
+    int     (*init_platform_hw)(void);
+    int     (*eeti_egalax_platform_sleep)(void);
+    int     (*eeti_egalax_platform_wakeup)(void);
+    void    (*exit_platform_hw)(void);
+    int     standby_pin;
+    int     standby_value;
+    int     disp_on_pin;
+    int     disp_on_value;
+};
+#endif
+
+struct ts_hw_data {
+       int reset_gpio;
+       int touch_en_gpio;
+};
+
+#if defined(CONFIG_TOUCHSCREEN_BYD693X)
+struct byd_platform_data {
+       u16     model;
+       int     pwr_pin;
+       int     int_pin;
+       int     rst_pin;
+       int     pwr_on_value;
+       int     *tp_flag;
+
+       uint16_t screen_max_x;
+       uint16_t screen_max_y;
+       u8 swap_xy :1;
+       u8 xpol :1;
+       u8 ypol :1;
+};
+#endif
+
+struct codec_io_info {
+       char    iomux_name[50];
+       int     iomux_mode;
+};
+
+struct rt3261_platform_data {
+       unsigned int codec_en_gpio;
+       struct codec_io_info codec_en_gpio_info;
+       int (*io_init)(int, char *, int);
+       unsigned int spk_num;
+       unsigned int modem_input_mode;
+       unsigned int lout_to_modem_mode;
+       unsigned int spk_amplify;
+       unsigned int playback_if1_data_control;
+       unsigned int playback_if2_data_control;
+};
+
 
 #define BOOT_MODE_NORMAL               0
 #define BOOT_MODE_FACTORY2             1
@@ -370,6 +473,18 @@ void rk28_send_wakeup_key(void);
 phys_addr_t __init board_mem_reserve_add(char *name, size_t size);
 void __init board_mem_reserved(void);
 
+extern struct rk29_sdmmc_platform_data default_sdmmc0_data;
+extern struct rk29_sdmmc_platform_data default_sdmmc1_data;
+
+extern struct i2c_gpio_platform_data default_i2c_gpio_data;
+extern struct rk29_vmac_platform_data board_vmac_data;
+
+void __init board_clock_init(void);
+void board_gpio_suspend(void);
+void board_gpio_resume(void);
+void __sramfunc board_pmu_suspend(void);
+void __sramfunc board_pmu_resume(void);
+
 /*
  * For DDR frequency scaling setup. Board code something like this:
  *