diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-14 11:30:33 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-27 14:32:50 +0100 |
| commit | 27d2d62b8b03c9dd2de9a367c19812e089da71c5 (patch) | |
| tree | fb9f54e5b420634bb8f633461e091e7b551d3b67 /arch/arm/mach-mx5/board-mx51_babbage.c | |
| parent | 0c1c8511a39ac980921e1c06b3f5809c7a42b522 (diff) | |
| download | linux-stable-27d2d62b8b03c9dd2de9a367c19812e089da71c5.tar.gz linux-stable-27d2d62b8b03c9dd2de9a367c19812e089da71c5.tar.bz2 linux-stable-27d2d62b8b03c9dd2de9a367c19812e089da71c5.zip | |
ARM i.MX51 mx51 babbage: remove unnecessary CONFIG_SERIAL_IMX ifdefs
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx5/board-mx51_babbage.c')
| -rw-r--r-- | arch/arm/mach-mx5/board-mx51_babbage.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/arch/arm/mach-mx5/board-mx51_babbage.c b/arch/arm/mach-mx5/board-mx51_babbage.c index 1d231e84107c..d9d402eb9478 100644 --- a/arch/arm/mach-mx5/board-mx51_babbage.c +++ b/arch/arm/mach-mx5/board-mx51_babbage.c @@ -161,23 +161,10 @@ static iomux_v3_cfg_t mx51babbage_pads[] = { }; /* Serial ports */ -#if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE) static const struct imxuart_platform_data uart_pdata __initconst = { .flags = IMXUART_HAVE_RTSCTS, }; -static inline void mxc_init_imx_uart(void) -{ - imx51_add_imx_uart(0, &uart_pdata); - imx51_add_imx_uart(1, &uart_pdata); - imx51_add_imx_uart(2, &uart_pdata); -} -#else /* !SERIAL_IMX */ -static inline void mxc_init_imx_uart(void) -{ -} -#endif /* SERIAL_IMX */ - static const struct imxi2c_platform_data babbage_i2c_data __initconst = { .bitrate = 100000, }; @@ -360,7 +347,11 @@ static void __init mxc_board_init(void) #endif mxc_iomux_v3_setup_multiple_pads(mx51babbage_pads, ARRAY_SIZE(mx51babbage_pads)); - mxc_init_imx_uart(); + + imx51_add_imx_uart(0, &uart_pdata); + imx51_add_imx_uart(1, &uart_pdata); + imx51_add_imx_uart(2, &uart_pdata); + babbage_fec_reset(); imx51_add_fec(NULL); |