Merge branch 'master' into tk71

[mv-sheeva.git] / arch / arm / mach-imx / mach-mxt_td60.c

diff --git a/arch/arm/mach-imx/mach-mxt_td60.c b/arch/arm/mach-imx/mach-mxt_td60.c
index a3a1e452d4c5a15bef12ced37d70d275fabd2fad..4ce71b0401db4c2d614c4507d7c3e2abc2edf8a8 100644 (file)
--- a/arch/arm/mach-imx/mach-mxt_td60.c
+++ b/arch/arm/mach-imx/mach-mxt_td60.c
@@ -31,13 +31,10 @@
 #include <mach/iomux-mx27.h>
 #include <mach/mxc_nand.h>
 #include <linux/i2c/pca953x.h>
-#include <mach/imxfb.h>
-#include <mach/mmc.h>
 
 #include "devices-imx27.h"
-#include "devices.h"
 
-static unsigned int mxt_td60_pins[] __initdata = {
+static const int mxt_td60_pins[] __initconst = {
        /* UART0 */
        PE12_PF_UART1_TXD,
        PE13_PF_UART1_RXD,
@@ -196,7 +193,7 @@ static struct imx_fb_videomode mxt_td60_modes[] = {
        },
 };
 
-static struct imx_fb_platform_data mxt_td60_fb_data = {
+static const struct imx_fb_platform_data mxt_td60_fb_data __initconst = {
        .mode = mxt_td60_modes,
        .num_modes = ARRAY_SIZE(mxt_td60_modes),
 
@@ -226,15 +223,11 @@ static void mxt_td60_sdhc1_exit(struct device *dev, void *data)
        free_irq(IRQ_GPIOF(8), data);
 }
 
-static struct imxmmc_platform_data sdhc1_pdata = {
+static const struct imxmmc_platform_data sdhc1_pdata __initconst = {
        .init = mxt_td60_sdhc1_init,
        .exit = mxt_td60_sdhc1_exit,
 };
 
-static struct platform_device *platform_devices[] __initdata = {
-       &mxc_fec_device,
-};
-
 static const struct imxuart_platform_data uart_pdata __initconst = {
        .flags = IMXUART_HAVE_RTSCTS,
 };
@@ -255,12 +248,11 @@ static void __init mxt_td60_board_init(void)
        i2c_register_board_info(1, mxt_td60_i2c2_devices,
                                ARRAY_SIZE(mxt_td60_i2c2_devices));
 
-       imx27_add_i2c_imx0(&mxt_td60_i2c0_data);
-       imx27_add_i2c_imx1(&mxt_td60_i2c1_data);
-       mxc_register_device(&mxc_fb_device, &mxt_td60_fb_data);
-       mxc_register_device(&mxc_sdhc_device0, &sdhc1_pdata);
-
-       platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
+       imx27_add_imx_i2c(0, &mxt_td60_i2c0_data);
+       imx27_add_imx_i2c(1, &mxt_td60_i2c1_data);
+       imx27_add_imx_fb(&mxt_td60_fb_data);
+       imx27_add_mxc_mmc(0, &sdhc1_pdata);
+       imx27_add_fec(NULL);
 }
 
 static void __init mxt_td60_timer_init(void)
@@ -274,8 +266,6 @@ static struct sys_timer mxt_td60_timer = {
 
 MACHINE_START(MXT_TD60, "Maxtrack i-MXT TD60")
        /* maintainer: Maxtrack Industrial */
-       .phys_io        = MX27_AIPI_BASE_ADDR,
-       .io_pg_offst    = ((MX27_AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc,
        .boot_params    = MX27_PHYS_OFFSET + 0x100,
        .map_io         = mx27_map_io,
        .init_irq       = mx27_init_irq,