diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-23 05:46:16 -0400 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-30 03:00:58 -0400 |
commit | 16cf5c41514fd94ff1e8b6be091e4b4732688fa6 (patch) | |
tree | b6c14199c6bac7a174c22a3d05eb48689a81df47 /arch/arm/mach-mx3/mach-pcm037.c | |
parent | d5dac4a69fe571ec12d999174e0425f2641325d4 (diff) |
ARM: imx: dynamically register imx-uart devices (imx31)
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/mach-pcm037.c')
-rw-r--r-- | arch/arm/mach-mx3/mach-pcm037.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-mx3/mach-pcm037.c b/arch/arm/mach-mx3/mach-pcm037.c index 7e3fc470d55d..e71e3904cff9 100644 --- a/arch/arm/mach-mx3/mach-pcm037.c +++ b/arch/arm/mach-mx3/mach-pcm037.c | |||
@@ -41,7 +41,6 @@ | |||
41 | #include <asm/mach/map.h> | 41 | #include <asm/mach/map.h> |
42 | #include <mach/common.h> | 42 | #include <mach/common.h> |
43 | #include <mach/hardware.h> | 43 | #include <mach/hardware.h> |
44 | #include <mach/imx-uart.h> | ||
45 | #include <mach/iomux-mx3.h> | 44 | #include <mach/iomux-mx3.h> |
46 | #include <mach/ipu.h> | 45 | #include <mach/ipu.h> |
47 | #include <mach/mmc.h> | 46 | #include <mach/mmc.h> |
@@ -219,7 +218,7 @@ static struct platform_device pcm037_flash = { | |||
219 | .num_resources = 1, | 218 | .num_resources = 1, |
220 | }; | 219 | }; |
221 | 220 | ||
222 | static struct imxuart_platform_data uart_pdata = { | 221 | static const struct imxuart_platform_data uart_pdata __initconst = { |
223 | .flags = IMXUART_HAVE_RTSCTS, | 222 | .flags = IMXUART_HAVE_RTSCTS, |
224 | }; | 223 | }; |
225 | 224 | ||
@@ -609,9 +608,10 @@ static void __init mxc_board_init(void) | |||
609 | 608 | ||
610 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 609 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
611 | 610 | ||
612 | mxc_register_device(&mxc_uart_device0, &uart_pdata); | 611 | imx31_add_imx_uart0(&uart_pdata); |
613 | mxc_register_device(&mxc_uart_device1, &uart_pdata); | 612 | /* XXX: should't this have .flags = 0 (i.e. no RTSCTS) on PCM037_EET? */ |
614 | mxc_register_device(&mxc_uart_device2, &uart_pdata); | 613 | imx31_add_imx_uart1(&uart_pdata); |
614 | imx31_add_imx_uart2(&uart_pdata); | ||
615 | 615 | ||
616 | mxc_register_device(&mxc_w1_master_device, NULL); | 616 | mxc_register_device(&mxc_w1_master_device, NULL); |
617 | 617 | ||