Skip to content

Commit

Permalink
ARM: imx: rename mxc_uart_devicex to follow a common naming scheme
Browse files Browse the repository at this point in the history 
Addionally remove an unneeded include.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  • Loading branch information
Uwe Kleine-König committed Jun 30, 2010
1 parent 3e87693 commit 551823e
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 37 deletions.
17 changes: 8 additions & 9 deletions arch/arm/mach-imx/devices.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/mmc.h>
#include <mach/imx-uart.h>

#include "devices.h"

Expand Down Expand Up @@ -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, \
Expand All @@ -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 */
Expand Down
14 changes: 8 additions & 6 deletions arch/arm/mach-imx/devices.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-imx/mach-cpuimx27.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-imx/mach-imx27lite.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down
6 changes: 3 additions & 3 deletions arch/arm/mach-imx/mach-mx21ads.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,9 @@ static void __init mx21ads_board_init(void)
mxc_gpio_setup_multiple_pins(mx21ads_pins, ARRAY_SIZE(mx21ads_pins),
"mx21ads");

mxc_register_device(&mxc_uart_device0, &uart_pdata);
mxc_register_device(&mxc_uart_device2, &uart_norts_pdata);
mxc_register_device(&mxc_uart_device3, &uart_pdata);
mxc_register_device(&imx2x_uart_device0, &uart_pdata);
mxc_register_device(&imx2x_uart_device2, &uart_norts_pdata);
mxc_register_device(&imx2x_uart_device3, &uart_pdata);
mxc_register_device(&mxc_fb_device, &mx21ads_fb_data);
mxc_register_device(&mxc_sdhc_device0, &mx21ads_sdhc_pdata);
mxc_register_device(&imx21_nand_device, &mx21ads_nand_board_info);
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-imx/mach-mx27_3ds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ static void __init mx27pdk_init(void)
{
mxc_gpio_setup_multiple_pins(mx27pdk_pins, ARRAY_SIZE(mx27pdk_pins),
"mx27pdk");
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));
}

Expand Down
12 changes: 6 additions & 6 deletions arch/arm/mach-imx/mach-mx27ads.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,12 +313,12 @@ static void __init mx27ads_board_init(void)
mxc_gpio_setup_multiple_pins(mx27ads_pins, ARRAY_SIZE(mx27ads_pins),
"mx27ads");

mxc_register_device(&mxc_uart_device0, &uart_pdata[0]);
mxc_register_device(&mxc_uart_device1, &uart_pdata[1]);
mxc_register_device(&mxc_uart_device2, &uart_pdata[2]);
mxc_register_device(&mxc_uart_device3, &uart_pdata[3]);
mxc_register_device(&mxc_uart_device4, &uart_pdata[4]);
mxc_register_device(&mxc_uart_device5, &uart_pdata[5]);
mxc_register_device(&imx2x_uart_device0, &uart_pdata[0]);
mxc_register_device(&imx2x_uart_device1, &uart_pdata[1]);
mxc_register_device(&imx2x_uart_device2, &uart_pdata[2]);
mxc_register_device(&imx2x_uart_device3, &uart_pdata[3]);
mxc_register_device(&imx2x_uart_device4, &uart_pdata[4]);
mxc_register_device(&imx2x_uart_device5, &uart_pdata[5]);
mxc_register_device(&imx27_nand_device, &mx27ads_nand_board_info);

/* only the i2c master 1 is used on this CPU card */
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/mach-imx/mach-mxt_td60.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,9 @@ static void __init mxt_td60_board_init(void)
mxc_gpio_setup_multiple_pins(mxt_td60_pins, ARRAY_SIZE(mxt_td60_pins),
"MXT_TD60");

mxc_register_device(&mxc_uart_device0, &uart_pdata[0]);
mxc_register_device(&mxc_uart_device1, &uart_pdata[1]);
mxc_register_device(&mxc_uart_device2, &uart_pdata[2]);
mxc_register_device(&imx2x_uart_device0, &uart_pdata[0]);
mxc_register_device(&imx2x_uart_device1, &uart_pdata[1]);
mxc_register_device(&imx2x_uart_device2, &uart_pdata[2]);
mxc_register_device(&imx27_nand_device, &mxt_td60_nand_board_info);

i2c_register_board_info(0, mxt_td60_i2c_devices,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-imx/mach-pca100.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ static void __init pca100_init(void)

mxc_register_device(&imx_ssi_device0, &pca100_ssi_pdata);

mxc_register_device(&mxc_uart_device0, &uart_pdata);
mxc_register_device(&imx2x_uart_device0, &uart_pdata);

mxc_gpio_mode(GPIO_PORTC | 29 | GPIO_GPIO | GPIO_IN);
mxc_register_device(&mxc_sdhc_device1, &sdhc_pdata);
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/mach-imx/mach-pcm038.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,9 @@ static void __init pcm038_init(void)

pcm038_init_sram();

mxc_register_device(&mxc_uart_device0, &uart_pdata[0]);
mxc_register_device(&mxc_uart_device1, &uart_pdata[1]);
mxc_register_device(&mxc_uart_device2, &uart_pdata[2]);
mxc_register_device(&imx2x_uart_device0, &uart_pdata[0]);
mxc_register_device(&imx2x_uart_device1, &uart_pdata[1]);
mxc_register_device(&imx2x_uart_device2, &uart_pdata[2]);

mxc_gpio_mode(PE16_AF_OWIRE);
mxc_register_device(&imx27_nand_device, &pcm038_nand_board_info);
Expand Down

0 comments on commit 551823e

Please sign in to comment.