diff options
Diffstat (limited to 'arch/arm/mach-mx3/mach-kzm_arm11_01.c')
-rw-r--r-- | arch/arm/mach-mx3/mach-kzm_arm11_01.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-mx3/mach-kzm_arm11_01.c b/arch/arm/mach-mx3/mach-kzm_arm11_01.c index 11291400ee5..5b23e416d6c 100644 --- a/arch/arm/mach-mx3/mach-kzm_arm11_01.c +++ b/arch/arm/mach-mx3/mach-kzm_arm11_01.c | |||
@@ -35,10 +35,10 @@ | |||
35 | 35 | ||
36 | #include <mach/clock.h> | 36 | #include <mach/clock.h> |
37 | #include <mach/common.h> | 37 | #include <mach/common.h> |
38 | #include <mach/imx-uart.h> | ||
39 | #include <mach/iomux-mx3.h> | 38 | #include <mach/iomux-mx3.h> |
40 | #include <mach/memory.h> | 39 | #include <mach/memory.h> |
41 | 40 | ||
41 | #include "devices-imx31.h" | ||
42 | #include "devices.h" | 42 | #include "devices.h" |
43 | 43 | ||
44 | #define KZM_ARM11_IO_ADDRESS(x) ( \ | 44 | #define KZM_ARM11_IO_ADDRESS(x) ( \ |
@@ -185,15 +185,14 @@ static inline int kzm_init_smsc9118(void) | |||
185 | #endif | 185 | #endif |
186 | 186 | ||
187 | #if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE) | 187 | #if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE) |
188 | static struct imxuart_platform_data uart_pdata = { | 188 | static const struct imxuart_platform_data uart_pdata __initconst = { |
189 | .flags = IMXUART_HAVE_RTSCTS, | 189 | .flags = IMXUART_HAVE_RTSCTS, |
190 | }; | 190 | }; |
191 | 191 | ||
192 | static void __init kzm_init_imx_uart(void) | 192 | static void __init kzm_init_imx_uart(void) |
193 | { | 193 | { |
194 | mxc_register_device(&mxc_uart_device0, &uart_pdata); | 194 | imx31_add_imx_uart0(&uart_pdata); |
195 | 195 | imx31_add_imx_uart1(&uart_pdata); | |
196 | mxc_register_device(&mxc_uart_device1, &uart_pdata); | ||
197 | } | 196 | } |
198 | #else | 197 | #else |
199 | static inline void kzm_init_imx_uart(void) | 198 | static inline void kzm_init_imx_uart(void) |