diff options
Diffstat (limited to 'arch/arm/mach-imx/mach-mx1ads.c')
-rw-r--r-- | arch/arm/mach-imx/mach-mx1ads.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/mach-mx1ads.c b/arch/arm/mach-imx/mach-mx1ads.c index 77a760cfadc..6187ce9ba7d 100644 --- a/arch/arm/mach-imx/mach-mx1ads.c +++ b/arch/arm/mach-imx/mach-mx1ads.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include "devices-imx1.h" | 32 | #include "devices-imx1.h" |
33 | #include "devices.h" | 33 | #include "devices.h" |
34 | 34 | ||
35 | static int mx1ads_pins[] = { | 35 | static const int mx1ads_pins[] __initconst = { |
36 | /* UART1 */ | 36 | /* UART1 */ |
37 | PC9_PF_UART1_CTS, | 37 | PC9_PF_UART1_CTS, |
38 | PC10_PF_UART1_RTS, | 38 | PC10_PF_UART1_RTS, |
@@ -131,7 +131,7 @@ static void __init mx1ads_init(void) | |||
131 | i2c_register_board_info(0, mx1ads_i2c_devices, | 131 | i2c_register_board_info(0, mx1ads_i2c_devices, |
132 | ARRAY_SIZE(mx1ads_i2c_devices)); | 132 | ARRAY_SIZE(mx1ads_i2c_devices)); |
133 | 133 | ||
134 | imx1_add_i2c_imx(&mx1ads_i2c_data); | 134 | imx1_add_imx_i2c(&mx1ads_i2c_data); |
135 | } | 135 | } |
136 | 136 | ||
137 | static void __init mx1ads_timer_init(void) | 137 | static void __init mx1ads_timer_init(void) |
@@ -145,8 +145,6 @@ struct sys_timer mx1ads_timer = { | |||
145 | 145 | ||
146 | MACHINE_START(MX1ADS, "Freescale MX1ADS") | 146 | MACHINE_START(MX1ADS, "Freescale MX1ADS") |
147 | /* Maintainer: Sascha Hauer, Pengutronix */ | 147 | /* Maintainer: Sascha Hauer, Pengutronix */ |
148 | .phys_io = MX1_IO_BASE_ADDR, | ||
149 | .io_pg_offst = (MX1_IO_BASE_ADDR_VIRT >> 18) & 0xfffc, | ||
150 | .boot_params = MX1_PHYS_OFFSET + 0x100, | 148 | .boot_params = MX1_PHYS_OFFSET + 0x100, |
151 | .map_io = mx1_map_io, | 149 | .map_io = mx1_map_io, |
152 | .init_irq = mx1_init_irq, | 150 | .init_irq = mx1_init_irq, |
@@ -155,8 +153,6 @@ MACHINE_START(MX1ADS, "Freescale MX1ADS") | |||
155 | MACHINE_END | 153 | MACHINE_END |
156 | 154 | ||
157 | MACHINE_START(MXLADS, "Freescale MXLADS") | 155 | MACHINE_START(MXLADS, "Freescale MXLADS") |
158 | .phys_io = MX1_IO_BASE_ADDR, | ||
159 | .io_pg_offst = (MX1_IO_BASE_ADDR_VIRT >> 18) & 0xfffc, | ||
160 | .boot_params = MX1_PHYS_OFFSET + 0x100, | 156 | .boot_params = MX1_PHYS_OFFSET + 0x100, |
161 | .map_io = mx1_map_io, | 157 | .map_io = mx1_map_io, |
162 | .init_irq = mx1_init_irq, | 158 | .init_irq = mx1_init_irq, |