diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-08-11 16:23:06 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-01 03:32:55 -0400 |
commit | 04b73b1571c26d491c62c42cb06b96bf482fa7a2 (patch) | |
tree | 1854fdcae02f4bb0b38af0e8630c826a705f615f /arch/arm/plat-mxc | |
parent | 2b82e64d787f9d1a5d304da137c2b1bdbe3b2d9d (diff) |
ARM: mx51: dynamically register imx-uart devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc')
-rw-r--r-- | arch/arm/plat-mxc/devices/platform-imx-uart.c | 10 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mx51.h | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-imx-uart.c b/arch/arm/plat-mxc/devices/platform-imx-uart.c index af7fabba4e71..2039640adf27 100644 --- a/arch/arm/plat-mxc/devices/platform-imx-uart.c +++ b/arch/arm/plat-mxc/devices/platform-imx-uart.c | |||
@@ -94,6 +94,16 @@ const struct imx_imx_uart_1irq_data imx35_imx_uart_data[] __initconst = { | |||
94 | }; | 94 | }; |
95 | #endif /* ifdef CONFIG_ARCH_MX35 */ | 95 | #endif /* ifdef CONFIG_ARCH_MX35 */ |
96 | 96 | ||
97 | #ifdef CONFIG_ARCH_MX51 | ||
98 | const struct imx_imx_uart_1irq_data imx51_imx_uart_data[] __initconst = { | ||
99 | #define imx51_imx_uart_data_entry(_id, _hwid) \ | ||
100 | imx_imx_uart_1irq_data_entry(MX51, _id, _hwid, SZ_4K) | ||
101 | imx51_imx_uart_data_entry(0, 1), | ||
102 | imx51_imx_uart_data_entry(1, 2), | ||
103 | imx51_imx_uart_data_entry(2, 3), | ||
104 | }; | ||
105 | #endif /* ifdef CONFIG_ARCH_MX51 */ | ||
106 | |||
97 | struct platform_device *__init imx_add_imx_uart_3irq( | 107 | struct platform_device *__init imx_add_imx_uart_3irq( |
98 | const struct imx_imx_uart_3irq_data *data, | 108 | const struct imx_imx_uart_3irq_data *data, |
99 | const struct imxuart_platform_data *pdata) | 109 | const struct imxuart_platform_data *pdata) |
diff --git a/arch/arm/plat-mxc/include/mach/mx51.h b/arch/arm/plat-mxc/include/mach/mx51.h index b919235768a0..b7359d7d54e2 100644 --- a/arch/arm/plat-mxc/include/mach/mx51.h +++ b/arch/arm/plat-mxc/include/mach/mx51.h | |||
@@ -310,9 +310,9 @@ | |||
310 | #define MX51_MXC_INT_SLIM_B 28 | 310 | #define MX51_MXC_INT_SLIM_B 28 |
311 | #define MX51_MXC_INT_SSI1 29 | 311 | #define MX51_MXC_INT_SSI1 29 |
312 | #define MX51_MXC_INT_SSI2 30 | 312 | #define MX51_MXC_INT_SSI2 30 |
313 | #define MX51_MXC_INT_UART1 31 | 313 | #define MX51_INT_UART1 31 |
314 | #define MX51_MXC_INT_UART2 32 | 314 | #define MX51_INT_UART2 32 |
315 | #define MX51_MXC_INT_UART3 33 | 315 | #define MX51_INT_UART3 33 |
316 | #define MX51_MXC_INT_RESV34 34 | 316 | #define MX51_MXC_INT_RESV34 34 |
317 | #define MX51_MXC_INT_RESV35 35 | 317 | #define MX51_MXC_INT_RESV35 35 |
318 | #define MX51_INT_ECSPI1 36 | 318 | #define MX51_INT_ECSPI1 36 |