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/mx31moboard-devboard.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/mx31moboard-devboard.c')
-rw-r--r-- | arch/arm/mach-mx3/mx31moboard-devboard.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mx3/mx31moboard-devboard.c b/arch/arm/mach-mx3/mx31moboard-devboard.c index 44473b16e62f..fc395a7a8599 100644 --- a/arch/arm/mach-mx3/mx31moboard-devboard.c +++ b/arch/arm/mach-mx3/mx31moboard-devboard.c | |||
@@ -23,13 +23,13 @@ | |||
23 | #include <linux/usb/otg.h> | 23 | #include <linux/usb/otg.h> |
24 | 24 | ||
25 | #include <mach/common.h> | 25 | #include <mach/common.h> |
26 | #include <mach/imx-uart.h> | ||
27 | #include <mach/iomux-mx3.h> | 26 | #include <mach/iomux-mx3.h> |
28 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
29 | #include <mach/mmc.h> | 28 | #include <mach/mmc.h> |
30 | #include <mach/mxc_ehci.h> | 29 | #include <mach/mxc_ehci.h> |
31 | #include <mach/ulpi.h> | 30 | #include <mach/ulpi.h> |
32 | 31 | ||
32 | #include "devices-imx31.h" | ||
33 | #include "devices.h" | 33 | #include "devices.h" |
34 | 34 | ||
35 | static unsigned int devboard_pins[] = { | 35 | static unsigned int devboard_pins[] = { |
@@ -52,7 +52,7 @@ static unsigned int devboard_pins[] = { | |||
52 | MX31_PIN_RI_DCE1__GPIO2_10, MX31_PIN_DCD_DCE1__GPIO2_11, | 52 | MX31_PIN_RI_DCE1__GPIO2_10, MX31_PIN_DCD_DCE1__GPIO2_11, |
53 | }; | 53 | }; |
54 | 54 | ||
55 | static struct imxuart_platform_data uart_pdata = { | 55 | static const struct imxuart_platform_data uart_pdata __initconst = { |
56 | .flags = IMXUART_HAVE_RTSCTS, | 56 | .flags = IMXUART_HAVE_RTSCTS, |
57 | }; | 57 | }; |
58 | 58 | ||
@@ -226,7 +226,7 @@ void __init mx31moboard_devboard_init(void) | |||
226 | mxc_iomux_setup_multiple_pins(devboard_pins, ARRAY_SIZE(devboard_pins), | 226 | mxc_iomux_setup_multiple_pins(devboard_pins, ARRAY_SIZE(devboard_pins), |
227 | "devboard"); | 227 | "devboard"); |
228 | 228 | ||
229 | mxc_register_device(&mxc_uart_device1, &uart_pdata); | 229 | imx31_add_imx_uart1(&uart_pdata); |
230 | 230 | ||
231 | mxc_register_device(&mxcsdhc_device1, &sdhc2_pdata); | 231 | mxc_register_device(&mxcsdhc_device1, &sdhc2_pdata); |
232 | 232 | ||