ARM i.MX51 mx51 babbage: remove unnecessary CONFIG_SERIAL_IMX ifdefs (27d2d62b) · Commits · e / devices / android_kernel_samsung_smdk4412

arch/arm/mach-mx5/board-mx51_babbage.c

+5 −14

Original line number	Original line	Diff line number	Diff line
	@@ -161,23 +161,10 @@ static iomux_v3_cfg_t mx51babbage_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 */

	static const struct imxi2c_platform_data babbage_i2c_data __initconst = {		static const struct imxi2c_platform_data babbage_i2c_data __initconst = {
	.bitrate = 100000,		.bitrate = 100000,
	};		};
	@@ -360,7 +347,11 @@ static void __init mxc_board_init(void)
	#endif		#endif
	mxc_iomux_v3_setup_multiple_pads(mx51babbage_pads,		mxc_iomux_v3_setup_multiple_pads(mx51babbage_pads,
	ARRAY_SIZE(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();		babbage_fec_reset();
	imx51_add_fec(NULL);		imx51_add_fec(NULL);