diff options
| author | Uwe Kleine-König | 2010-06-23 11:46:16 +0200 |
|---|---|---|
| committer | Uwe Kleine-König | 2010-06-30 09:00:58 +0200 |
| commit | 16cf5c41514fd94ff1e8b6be091e4b4732688fa6 (patch) | |
| tree | b6c14199c6bac7a174c22a3d05eb48689a81df47 /arch/arm/mach-mx3/mach-armadillo5x0.c | |
| parent | ARM: imx: dynamically register imx-uart devices (imx27) (diff) | |
| download | kernel-qcow2-linux-16cf5c41514fd94ff1e8b6be091e4b4732688fa6.tar.gz kernel-qcow2-linux-16cf5c41514fd94ff1e8b6be091e4b4732688fa6.tar.xz kernel-qcow2-linux-16cf5c41514fd94ff1e8b6be091e4b4732688fa6.zip | |
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-armadillo5x0.c')
| -rw-r--r-- | arch/arm/mach-mx3/mach-armadillo5x0.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-mx3/mach-armadillo5x0.c b/arch/arm/mach-mx3/mach-armadillo5x0.c index 423ffe774ead..96aadcadb4ff 100644 --- a/arch/arm/mach-mx3/mach-armadillo5x0.c +++ b/arch/arm/mach-mx3/mach-armadillo5x0.c @@ -48,7 +48,6 @@ #include <asm/mach/map.h> #include <mach/common.h> -#include <mach/imx-uart.h> #include <mach/iomux-mx3.h> #include <mach/mmc.h> #include <mach/ipu.h> @@ -493,7 +492,7 @@ static struct platform_device armadillo5x0_smc911x_device = { }; /* UART device data */ -static struct imxuart_platform_data uart_pdata = { +static const struct imxuart_platform_data uart_pdata __initconst = { .flags = IMXUART_HAVE_RTSCTS, }; @@ -514,8 +513,8 @@ static void __init armadillo5x0_init(void) imx31_add_imx_i2c1(NULL); /* Register UART */ - mxc_register_device(&mxc_uart_device0, &uart_pdata); - mxc_register_device(&mxc_uart_device1, &uart_pdata); + imx31_add_imx_uart0(&uart_pdata); + imx31_add_imx_uart1(&uart_pdata); /* SMSC9118 IRQ pin */ gpio_direction_input(MX31_PIN_GPIO1_0); |