aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2011-06-21 13:49:36 -0400
committerSascha Hauer <s.hauer@pengutronix.de>2011-07-07 04:00:01 -0400
commit31b738a4f4dfea3b464a9cb5fe18aa4ba85eb984 (patch)
treea34fca6409e2254c1cf05652413787626fb9f8e9 /arch/arm
parentae817266710b18f767cf247e9568f52fb88abca0 (diff)
ARM: mach-imx/scb9328: Make the UART gpio setup simpler
Place the UART gpio initialization inside the scb9328_init function as it is done on other i.MX boards. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-imx/mach-scb9328.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/arch/arm/mach-imx/mach-scb9328.c b/arch/arm/mach-imx/mach-scb9328.c
index dcaee043628e..b77386573502 100644
--- a/arch/arm/mach-imx/mach-scb9328.c
+++ b/arch/arm/mach-imx/mach-scb9328.c
@@ -101,21 +101,7 @@ static const int mxc_uart1_pins[] = {
101 PC12_PF_UART1_RXD, 101 PC12_PF_UART1_RXD,
102}; 102};
103 103
104static int uart1_mxc_init(struct platform_device *pdev)
105{
106 return mxc_gpio_setup_multiple_pins(mxc_uart1_pins,
107 ARRAY_SIZE(mxc_uart1_pins), "UART1");
108}
109
110static void uart1_mxc_exit(struct platform_device *pdev)
111{
112 mxc_gpio_release_multiple_pins(mxc_uart1_pins,
113 ARRAY_SIZE(mxc_uart1_pins));
114}
115
116static const struct imxuart_platform_data uart_pdata __initconst = { 104static const struct imxuart_platform_data uart_pdata __initconst = {
117 .init = uart1_mxc_init,
118 .exit = uart1_mxc_exit,
119 .flags = IMXUART_HAVE_RTSCTS, 105 .flags = IMXUART_HAVE_RTSCTS,
120}; 106};
121 107
@@ -129,6 +115,9 @@ static struct platform_device *devices[] __initdata = {
129 */ 115 */
130static void __init scb9328_init(void) 116static void __init scb9328_init(void)
131{ 117{
118 mxc_gpio_setup_multiple_pins(mxc_uart1_pins,
119 ARRAY_SIZE(mxc_uart1_pins), "UART1");
120
132 imx1_add_imx_uart0(&uart_pdata); 121 imx1_add_imx_uart0(&uart_pdata);
133 122
134 printk(KERN_INFO"Scb9328: Adding devices\n"); 123 printk(KERN_INFO"Scb9328: Adding devices\n");