diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-23 11:46:16 +0200 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-30 09:00:58 +0200 |
| commit | 16cf5c41514fd94ff1e8b6be091e4b4732688fa6 (patch) | |
| tree | b6c14199c6bac7a174c22a3d05eb48689a81df47 /arch/arm/mach-mx3/devices.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/devices.c')
| -rw-r--r-- | arch/arm/mach-mx3/devices.c | 43 |
1 files changed, 2 insertions, 41 deletions
diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c index dd90ee9a0d63..5b428626c05a 100644 --- a/arch/arm/mach-mx3/devices.c +++ b/arch/arm/mach-mx3/devices.c @@ -25,11 +25,11 @@ #include <mach/hardware.h> #include <mach/irqs.h> #include <mach/common.h> -#include <mach/imx-uart.h> #include <mach/mx3_camera.h> #include "devices.h" +#if defined(CONFIG_ARCH_MX35) static struct resource uart0[] = { { .start = UART1_BASE_ADDR, @@ -86,46 +86,7 @@ struct platform_device mxc_uart_device2 = { .resource = uart2, .num_resources = ARRAY_SIZE(uart2), }; - -#ifdef CONFIG_ARCH_MX31 -static struct resource uart3[] = { - { - .start = UART4_BASE_ADDR, - .end = UART4_BASE_ADDR + 0x0B5, - .flags = IORESOURCE_MEM, - }, { - .start = MXC_INT_UART4, - .end = MXC_INT_UART4, - .flags = IORESOURCE_IRQ, - }, -}; - -struct platform_device mxc_uart_device3 = { - .name = "imx-uart", - .id = 3, - .resource = uart3, - .num_resources = ARRAY_SIZE(uart3), -}; - -static struct resource uart4[] = { - { - .start = UART5_BASE_ADDR, - .end = UART5_BASE_ADDR + 0x0B5, - .flags = IORESOURCE_MEM, - }, { - .start = MXC_INT_UART5, - .end = MXC_INT_UART5, - .flags = IORESOURCE_IRQ, - }, -}; - -struct platform_device mxc_uart_device4 = { - .name = "imx-uart", - .id = 4, - .resource = uart4, - .num_resources = ARRAY_SIZE(uart4), -}; -#endif /* CONFIG_ARCH_MX31 */ +#endif /* GPIO port description */ static struct mxc_gpio_port imx_gpio_ports[] = { |