Commit 551823e7 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: imx: rename mxc_uart_devicex to follow a common naming scheme 



Addionally remove an unneeded include.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 3e876935

arch/arm/mach-imx/devices.c

+8 −9
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include <mach/hardware.h>

#include <mach/common.h>

#include <mach/mmc.h>

#include <mach/imx-uart.h>



#include "devices.h"
@@ -426,7 +425,7 @@ struct platform_device mxc_usbh2 = { 
DEFINE_IMX_SSI_DEVICE(0, 1, MX2x_SSI1_BASE_ADDR, MX2x_INT_SSI1);

DEFINE_IMX_SSI_DEVICE(1, 2, MX2x_SSI1_BASE_ADDR, MX2x_INT_SSI1);



#define DEFINE_IMX_UART_DEVICE(n, baseaddr, irq)			\

#define DEFINE_IMX2x_UART_DEVICE(n, baseaddr, irq)			\

	static struct resource imx2x_uart_resources ## n[] = {		\

		{							\

			.start = baseaddr,				\
@@ -439,21 +438,21 @@ DEFINE_IMX_SSI_DEVICE(1, 2, MX2x_SSI1_BASE_ADDR, MX2x_INT_SSI1); 
		},							\

	};								\

									\

	struct platform_device mxc_uart_device ## n = {			\

	struct platform_device imx2x_uart_device ## n = {		\

		.name = "imx-uart",					\

		.id = n,						\

		.num_resources = ARRAY_SIZE(imx2x_uart_resources ## n),	\

		.resource = imx2x_uart_resources ## n,			\

	}



DEFINE_IMX_UART_DEVICE(0, MX2x_UART1_BASE_ADDR, MX2x_INT_UART1);

DEFINE_IMX_UART_DEVICE(1, MX2x_UART2_BASE_ADDR, MX2x_INT_UART2);

DEFINE_IMX_UART_DEVICE(2, MX2x_UART3_BASE_ADDR, MX2x_INT_UART3);

DEFINE_IMX_UART_DEVICE(3, MX2x_UART4_BASE_ADDR, MX2x_INT_UART4);

DEFINE_IMX2x_UART_DEVICE(0, MX2x_UART1_BASE_ADDR, MX2x_INT_UART1);

DEFINE_IMX2x_UART_DEVICE(1, MX2x_UART2_BASE_ADDR, MX2x_INT_UART2);

DEFINE_IMX2x_UART_DEVICE(2, MX2x_UART3_BASE_ADDR, MX2x_INT_UART3);

DEFINE_IMX2x_UART_DEVICE(3, MX2x_UART4_BASE_ADDR, MX2x_INT_UART4);



#ifdef CONFIG_MACH_MX27

DEFINE_IMX_UART_DEVICE(4, MX27_UART5_BASE_ADDR, MX27_INT_UART5);

DEFINE_IMX_UART_DEVICE(5, MX27_UART6_BASE_ADDR, MX27_INT_UART6);

DEFINE_IMX2x_UART_DEVICE(4, MX27_UART5_BASE_ADDR, MX27_INT_UART5);

DEFINE_IMX2x_UART_DEVICE(5, MX27_UART6_BASE_ADDR, MX27_INT_UART6);

#endif



/* GPIO port description */

arch/arm/mach-imx/devices.h

+8 −6
Original line number Diff line number Diff line
@@ -6,12 +6,14 @@ extern struct platform_device mxc_gpt4; 
extern struct platform_device mxc_gpt5;

#endif

extern struct platform_device mxc_wdt;

extern struct platform_device mxc_uart_device0;

extern struct platform_device mxc_uart_device1;

extern struct platform_device mxc_uart_device2;

extern struct platform_device mxc_uart_device3;

extern struct platform_device mxc_uart_device4;

extern struct platform_device mxc_uart_device5;

extern struct platform_device imx2x_uart_device0;

extern struct platform_device imx2x_uart_device1;

extern struct platform_device imx2x_uart_device2;

extern struct platform_device imx2x_uart_device3;

#ifdef CONFIG_MACH_MX27

extern struct platform_device imx2x_uart_device4;

extern struct platform_device imx2x_uart_device5;

#endif

extern struct platform_device mxc_w1_master_device;

#ifdef CONFIG_MACH_MX21

extern struct platform_device imx21_nand_device;

arch/arm/mach-imx/eukrea_mbimx27-baseboard.c

+2 −2
Original line number Diff line number Diff line
@@ -222,8 +222,8 @@ void __init eukrea_mbimx27_baseboard_init(void) 
	mxc_gpio_setup_multiple_pins(eukrea_mbimx27_pins,

		ARRAY_SIZE(eukrea_mbimx27_pins), "MBIMX27");



	mxc_register_device(&mxc_uart_device1, &uart_pdata[0]);

	mxc_register_device(&mxc_uart_device2, &uart_pdata[1]);

	mxc_register_device(&imx2x_uart_device1, &uart_pdata[0]);

	mxc_register_device(&imx2x_uart_device2, &uart_pdata[1]);



	mxc_register_device(&mxc_fb_device, &eukrea_mbimx27_fb_data);

	mxc_register_device(&mxc_sdhc_device0, NULL);

arch/arm/mach-imx/mach-cpuimx27.c

+2 −2
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static void __init eukrea_cpuimx27_init(void) 
	mxc_gpio_setup_multiple_pins(eukrea_cpuimx27_pins,

		ARRAY_SIZE(eukrea_cpuimx27_pins), "CPUIMX27");



	mxc_register_device(&mxc_uart_device0, &uart_pdata[0]);

	mxc_register_device(&imx2x_uart_device0, &uart_pdata[0]);



	mxc_register_device(&imx27_nand_device,

			&eukrea_cpuimx27_nand_board_info);
@@ -203,7 +203,7 @@ static void __init eukrea_cpuimx27_init(void) 
	/* SDHC2 can be used for Wifi */

	mxc_register_device(&mxc_sdhc_device1, NULL);

	/* in which case UART4 is also used for Bluetooth */

	mxc_register_device(&mxc_uart_device3, &uart_pdata[1]);

	mxc_register_device(&imx2x_uart_device3, &uart_pdata[1]);

#endif



#if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE)

arch/arm/mach-imx/mach-imx27lite.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static void __init mx27lite_init(void) 
{

	mxc_gpio_setup_multiple_pins(mx27lite_pins, ARRAY_SIZE(mx27lite_pins),

		"imx27lite");

	mxc_register_device(&mxc_uart_device0, &uart_pdata);

	mxc_register_device(&imx2x_uart_device0, &uart_pdata);

	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));

}