diff options
Diffstat (limited to 'arch/arm/mach-imx/mach-mx27ads.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx27ads.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/mach-mx27ads.c b/arch/arm/mach-imx/mach-mx27ads.c index 9c77da98a10e..a1e4bc573afc 100644 --- a/arch/arm/mach-imx/mach-mx27ads.c +++ b/arch/arm/mach-imx/mach-mx27ads.c | |||
| @@ -66,7 +66,7 @@ | |||
| 66 | /* to determine the correct external crystal reference */ | 66 | /* to determine the correct external crystal reference */ |
| 67 | #define CKIH_27MHZ_BIT_SET (1 << 3) | 67 | #define CKIH_27MHZ_BIT_SET (1 << 3) |
| 68 | 68 | ||
| 69 | static unsigned int mx27ads_pins[] = { | 69 | static const int mx27ads_pins[] __initconst = { |
| 70 | /* UART0 */ | 70 | /* UART0 */ |
| 71 | PE12_PF_UART1_TXD, | 71 | PE12_PF_UART1_TXD, |
| 72 | PE13_PF_UART1_RXD, | 72 | PE13_PF_UART1_RXD, |
| @@ -284,7 +284,6 @@ static struct imxmmc_platform_data sdhc2_pdata = { | |||
| 284 | 284 | ||
| 285 | static struct platform_device *platform_devices[] __initdata = { | 285 | static struct platform_device *platform_devices[] __initdata = { |
| 286 | &mx27ads_nor_mtd_device, | 286 | &mx27ads_nor_mtd_device, |
| 287 | &mxc_fec_device, | ||
| 288 | &mxc_w1_master_device, | 287 | &mxc_w1_master_device, |
| 289 | }; | 288 | }; |
| 290 | 289 | ||
| @@ -308,11 +307,12 @@ static void __init mx27ads_board_init(void) | |||
| 308 | /* only the i2c master 1 is used on this CPU card */ | 307 | /* only the i2c master 1 is used on this CPU card */ |
| 309 | i2c_register_board_info(1, mx27ads_i2c_devices, | 308 | i2c_register_board_info(1, mx27ads_i2c_devices, |
| 310 | ARRAY_SIZE(mx27ads_i2c_devices)); | 309 | ARRAY_SIZE(mx27ads_i2c_devices)); |
| 311 | imx27_add_i2c_imx1(&mx27ads_i2c1_data); | 310 | imx27_add_imx_i2c(1, &mx27ads_i2c1_data); |
| 312 | mxc_register_device(&mxc_fb_device, &mx27ads_fb_data); | 311 | mxc_register_device(&mxc_fb_device, &mx27ads_fb_data); |
| 313 | mxc_register_device(&mxc_sdhc_device0, &sdhc1_pdata); | 312 | mxc_register_device(&mxc_sdhc_device0, &sdhc1_pdata); |
| 314 | mxc_register_device(&mxc_sdhc_device1, &sdhc2_pdata); | 313 | mxc_register_device(&mxc_sdhc_device1, &sdhc2_pdata); |
| 315 | 314 | ||
| 315 | imx27_add_fec(NULL); | ||
| 316 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); | 316 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); |
| 317 | } | 317 | } |
| 318 | 318 | ||
| @@ -347,8 +347,6 @@ static void __init mx27ads_map_io(void) | |||
| 347 | 347 | ||
| 348 | MACHINE_START(MX27ADS, "Freescale i.MX27ADS") | 348 | MACHINE_START(MX27ADS, "Freescale i.MX27ADS") |
| 349 | /* maintainer: Freescale Semiconductor, Inc. */ | 349 | /* maintainer: Freescale Semiconductor, Inc. */ |
| 350 | .phys_io = MX27_AIPI_BASE_ADDR, | ||
| 351 | .io_pg_offst = ((MX27_AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc, | ||
| 352 | .boot_params = MX27_PHYS_OFFSET + 0x100, | 350 | .boot_params = MX27_PHYS_OFFSET + 0x100, |
| 353 | .map_io = mx27ads_map_io, | 351 | .map_io = mx27ads_map_io, |
| 354 | .init_irq = mx27_init_irq, | 352 | .init_irq = mx27_init_irq, |
