From c6c2613c37e969dddd69502c3951895e07d61ea5 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 21 Jun 2011 14:49:36 -0300 Subject: [PATCH] --- yaml --- r: 258687 b: refs/heads/master c: 31b738a4f4dfea3b464a9cb5fe18aa4ba85eb984 h: refs/heads/master i: 258685: e6c3363bb95d435d49d67a6fb014137075c1dd95 258683: bbf47fa3f35673cf2c72929da035a77c45de92e3 258679: da2f1708ea2b2baaffc8d5b33db99df6aee9230f 258671: c3f161e68cd489e375a4c628475eaefd3d99cf07 258655: 9ea13f98f9e43dcef89af5e6399483c13e20ea02 258623: 65bcdb3601018180026d156283b1090d22412c25 258559: 4c8e681f83e46d180a8446607cc44a00e6db90d4 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/mach-scb9328.c | 17 +++-------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index c7f60d452a22..e82716e41196 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae817266710b18f767cf247e9568f52fb88abca0 +refs/heads/master: 31b738a4f4dfea3b464a9cb5fe18aa4ba85eb984 diff --git a/trunk/arch/arm/mach-imx/mach-scb9328.c b/trunk/arch/arm/mach-imx/mach-scb9328.c index dcaee043628e..b77386573502 100644 --- a/trunk/arch/arm/mach-imx/mach-scb9328.c +++ b/trunk/arch/arm/mach-imx/mach-scb9328.c @@ -101,21 +101,7 @@ static const int mxc_uart1_pins[] = { PC12_PF_UART1_RXD, }; -static int uart1_mxc_init(struct platform_device *pdev) -{ - return mxc_gpio_setup_multiple_pins(mxc_uart1_pins, - ARRAY_SIZE(mxc_uart1_pins), "UART1"); -} - -static void uart1_mxc_exit(struct platform_device *pdev) -{ - mxc_gpio_release_multiple_pins(mxc_uart1_pins, - ARRAY_SIZE(mxc_uart1_pins)); -} - static const struct imxuart_platform_data uart_pdata __initconst = { - .init = uart1_mxc_init, - .exit = uart1_mxc_exit, .flags = IMXUART_HAVE_RTSCTS, }; @@ -129,6 +115,9 @@ static struct platform_device *devices[] __initdata = { */ static void __init scb9328_init(void) { + mxc_gpio_setup_multiple_pins(mxc_uart1_pins, + ARRAY_SIZE(mxc_uart1_pins), "UART1"); + imx1_add_imx_uart0(&uart_pdata); printk(KERN_INFO"Scb9328: Adding devices\n");