浏览代码

ARM i.MX51 mx51 3ds: remove unnecessary CONFIG_SERIAL_IMX ifdefs

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer 14 年之前
父节点
当前提交
0c1c8511a3
共有 1 个文件被更改,包括 4 次插入14 次删除
  1. 4 14
      arch/arm/mach-mx5/board-mx51_3ds.c

+ 4 - 14
arch/arm/mach-mx5/board-mx51_3ds.c

@@ -71,23 +71,10 @@ static iomux_v3_cfg_t mx51_3ds_pads[] = {
 };
 };
 
 
 /* Serial ports */
 /* Serial ports */
-#if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE)
 static const struct imxuart_platform_data uart_pdata __initconst = {
 static const struct imxuart_platform_data uart_pdata __initconst = {
 	.flags = IMXUART_HAVE_RTSCTS,
 	.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 */
-
 #if defined(CONFIG_KEYBOARD_IMX) || defined(CONFIG_KEYBOARD_IMX_MODULE)
 #if defined(CONFIG_KEYBOARD_IMX) || defined(CONFIG_KEYBOARD_IMX_MODULE)
 static int mx51_3ds_board_keymap[] = {
 static int mx51_3ds_board_keymap[] = {
 	KEY(0, 0, KEY_1),
 	KEY(0, 0, KEY_1),
@@ -161,7 +148,10 @@ static void __init mxc_board_init(void)
 {
 {
 	mxc_iomux_v3_setup_multiple_pads(mx51_3ds_pads,
 	mxc_iomux_v3_setup_multiple_pads(mx51_3ds_pads,
 					ARRAY_SIZE(mx51_3ds_pads));
 					ARRAY_SIZE(mx51_3ds_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);
 
 
 	imx51_add_ecspi(1, &mx51_3ds_ecspi2_pdata);
 	imx51_add_ecspi(1, &mx51_3ds_ecspi2_pdata);
 	spi_register_board_info(mx51_3ds_spi_nor_device,
 	spi_register_board_info(mx51_3ds_spi_nor_device,