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

[deliverable/linux.git] / arch / arm / mach-mx1 / devices.c

diff --git a/arch/arm/mach-mx1/devices.c b/arch/arm/mach-mx1/devices.c
index fa3809d2d1bf3795be138fdce4f643f872e41fe7..a79e6132dbe506819c6ad697c36c276dbac31186 100644 (file)
--- a/arch/arm/mach-mx1/devices.c
+++ b/arch/arm/mach-mx1/devices.c
@@ -66,66 +66,43 @@ static struct resource imx_i2c_resources[] = {
        },
 };
 
-struct platform_device imx_i2c_device = {
+struct platform_device imx_i2c_device0 = {
        .name           = "imx-i2c",
        .id             = 0,
        .resource       = imx_i2c_resources,
        .num_resources  = ARRAY_SIZE(imx_i2c_resources),
 };
 
-static struct resource imx_uart1_resources[] = {
-       {
-               .start = MX1_UART1_BASE_ADDR,
-               .end = MX1_UART1_BASE_ADDR + 0xD0,
-               .flags = IORESOURCE_MEM,
-       }, {
-               .start = MX1_UART1_MINT_RX,
-               .end = MX1_UART1_MINT_RX,
-               .flags = IORESOURCE_IRQ,
-       }, {
-               .start = MX1_UART1_MINT_TX,
-               .end = MX1_UART1_MINT_TX,
-               .flags = IORESOURCE_IRQ,
-       }, {
-               .start = MX1_UART1_MINT_RTS,
-               .end = MX1_UART1_MINT_RTS,
-               .flags = IORESOURCE_IRQ,
-       },
-};
-
-struct platform_device imx_uart1_device = {
-       .name           = "imx-uart",
-       .id             = 0,
-       .num_resources  = ARRAY_SIZE(imx_uart1_resources),
-       .resource       = imx_uart1_resources,
-};
-
-static struct resource imx_uart2_resources[] = {
-       {
-               .start = MX1_UART2_BASE_ADDR,
-               .end = MX1_UART2_BASE_ADDR + 0xD0,
-               .flags = IORESOURCE_MEM,
-       }, {
-               .start = MX1_UART2_MINT_RX,
-               .end = MX1_UART2_MINT_RX,
-               .flags = IORESOURCE_IRQ,
-       }, {
-               .start = MX1_UART2_MINT_TX,
-               .end = MX1_UART2_MINT_TX,
-               .flags = IORESOURCE_IRQ,
-       }, {
-               .start = MX1_UART2_MINT_RTS,
-               .end = MX1_UART2_MINT_RTS,
-               .flags = IORESOURCE_IRQ,
-       },
-};
+#define DEFINE_IMX1_UART_DEVICE(n, baseaddr, irqrx, irqtx, irqrts)     \
+       static struct resource imx1_uart_resources ## n[] = {           \
+               {                                                       \
+                       .start = baseaddr,                              \
+                       .end = baseaddr + 0xd0,                         \
+                       .flags = IORESOURCE_MEM,                        \
+               }, {                                                    \
+                       .start = irqrx,                                 \
+                       .end = irqrx,                                   \
+                       .flags = IORESOURCE_IRQ,                        \
+               }, {                                                    \
+                       .start = irqtx,                                 \
+                       .end = irqtx,                                   \
+                       .flags = IORESOURCE_IRQ,                        \
+               }, {                                                    \
+                       .start = irqrts,                                \
+                       .end = irqrts,                                  \
+                       .flags = IORESOURCE_IRQ,                        \
+               },                                                      \
+       };                                                              \
+                                                                       \
+       struct platform_device imx1_uart_device ## n = {                \
+               .name = "imx-uart",                                     \
+               .id = n,                                                \
+               .num_resources = ARRAY_SIZE(imx1_uart_resources ## n),  \
+               .resource = imx1_uart_resources ## n,                   \
+       }
 
-struct platform_device imx_uart2_device = {
-       .name           = "imx-uart",
-       .id             = 1,
-       .num_resources  = ARRAY_SIZE(imx_uart2_resources),
-       .resource       = imx_uart2_resources,
-};
+DEFINE_IMX1_UART_DEVICE(0, MX1_UART1_BASE_ADDR, MX1_UART1_MINT_RX, MX1_UART1_MINT_TX, MX1_UART1_MINT_RTS);
+DEFINE_IMX1_UART_DEVICE(1, MX1_UART2_BASE_ADDR, MX1_UART2_MINT_RX, MX1_UART2_MINT_TX, MX1_UART2_MINT_RTS);
 
 static struct resource imx_rtc_resources[] = {
        {