diff options
Diffstat (limited to 'arch/arm/mach-mx3/mx31moboard-devboard.c')
-rw-r--r-- | arch/arm/mach-mx3/mx31moboard-devboard.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/arch/arm/mach-mx3/mx31moboard-devboard.c b/arch/arm/mach-mx3/mx31moboard-devboard.c index d080b4add79c..718702f1ebe6 100644 --- a/arch/arm/mach-mx3/mx31moboard-devboard.c +++ b/arch/arm/mach-mx3/mx31moboard-devboard.c | |||
@@ -16,33 +16,36 @@ | |||
16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include <linux/types.h> | ||
20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
21 | |||
22 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
21 | #include <linux/types.h> | ||
23 | 22 | ||
24 | #include <mach/hardware.h> | ||
25 | #include <mach/common.h> | 23 | #include <mach/common.h> |
26 | #include <mach/imx-uart.h> | 24 | #include <mach/imx-uart.h> |
27 | #include <mach/iomux-mx3.h> | 25 | #include <mach/iomux-mx3.h> |
26 | #include <mach/hardware.h> | ||
28 | 27 | ||
29 | #include "devices.h" | 28 | #include "devices.h" |
30 | 29 | ||
31 | static struct imxuart_platform_data uart_pdata = { | 30 | static unsigned int devboard_pins[] = { |
32 | .flags = IMXUART_HAVE_RTSCTS, | 31 | /* UART1 */ |
33 | }; | ||
34 | |||
35 | static int mxc_uart1_pins[] = { | ||
36 | MX31_PIN_CTS2__CTS2, MX31_PIN_RTS2__RTS2, | 32 | MX31_PIN_CTS2__CTS2, MX31_PIN_RTS2__RTS2, |
37 | MX31_PIN_TXD2__TXD2, MX31_PIN_RXD2__RXD2, | 33 | MX31_PIN_TXD2__TXD2, MX31_PIN_RXD2__RXD2, |
38 | }; | 34 | }; |
39 | 35 | ||
36 | static struct imxuart_platform_data uart_pdata = { | ||
37 | .flags = IMXUART_HAVE_RTSCTS, | ||
38 | }; | ||
39 | |||
40 | /* | 40 | /* |
41 | * system init for baseboard usage. Will be called by mx31moboard init. | 41 | * system init for baseboard usage. Will be called by mx31moboard init. |
42 | */ | 42 | */ |
43 | void __init mx31moboard_devboard_init(void) | 43 | void __init mx31moboard_devboard_init(void) |
44 | { | 44 | { |
45 | printk(KERN_INFO "Initializing mx31devboard peripherals\n"); | 45 | printk(KERN_INFO "Initializing mx31devboard peripherals\n"); |
46 | mxc_iomux_setup_multiple_pins(mxc_uart1_pins, ARRAY_SIZE(mxc_uart1_pins), "uart1"); | 46 | |
47 | mxc_iomux_setup_multiple_pins(devboard_pins, ARRAY_SIZE(devboard_pins), | ||
48 | "devboard"); | ||
49 | |||
47 | mxc_register_device(&mxc_uart_device1, &uart_pdata); | 50 | mxc_register_device(&mxc_uart_device1, &uart_pdata); |
48 | } | 51 | } |