summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3
diff options
context:
space:
mode:
authorMagnus Lilja <lilja.magnus@gmail.com>2009-05-16 12:43:10 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2009-05-16 16:25:04 +0200
commit153fa1d8c6cf7b0e552bbd093dbad2e3c9b318ed (patch)
tree29cde0d2f345e56d750049c96b7a76190cd1b0bc /arch/arm/mach-mx3
parent92ab0a50157449c5bcf55ab4aad0a0c2da0be7c7 (diff)
downloadop-kernel-dev-153fa1d8c6cf7b0e552bbd093dbad2e3c9b318ed.zip
op-kernel-dev-153fa1d8c6cf7b0e552bbd093dbad2e3c9b318ed.tar.gz
i.MX31: Restructure UART setup for PDK board.
Restructure UART pin setup in preparation for adding other pins in later patches. Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3')
-rw-r--r--arch/arm/mach-mx3/mx31pdk.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/arch/arm/mach-mx3/mx31pdk.c b/arch/arm/mach-mx3/mx31pdk.c
index 048084b..5345498 100644
--- a/arch/arm/mach-mx3/mx31pdk.c
+++ b/arch/arm/mach-mx3/mx31pdk.c
@@ -41,29 +41,27 @@
* @ingroup System
*/
-static struct imxuart_platform_data uart_pdata = {
- .flags = IMXUART_HAVE_RTSCTS,
-};
-
-static int uart_pins[] = {
+static int mx31pdk_pins[] = {
+ /* UART1 */
MX31_PIN_CTS1__CTS1,
MX31_PIN_RTS1__RTS1,
MX31_PIN_TXD1__TXD1,
MX31_PIN_RXD1__RXD1
};
-static inline void mxc_init_imx_uart(void)
-{
- mxc_iomux_setup_multiple_pins(uart_pins, ARRAY_SIZE(uart_pins), "uart-0");
- mxc_register_device(&mxc_uart_device0, &uart_pdata);
-}
+static struct imxuart_platform_data uart_pdata = {
+ .flags = IMXUART_HAVE_RTSCTS,
+};
/*!
* Board specific initialization.
*/
static void __init mxc_board_init(void)
{
- mxc_init_imx_uart();
+ mxc_iomux_setup_multiple_pins(mx31pdk_pins, ARRAY_SIZE(mx31pdk_pins),
+ "mx31pdk");
+
+ mxc_register_device(&mxc_uart_device0, &uart_pdata);
}
static void __init mx31pdk_timer_init(void)
OpenPOWER on IntegriCloud