3 files changed, 15 insertions, 40 deletions

diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c
index e08c6a8ac56b..a6bdcc07f3c9 100644
--- a/arch/arm/mach-mx3/devices.c
+++ b/arch/arm/mach-mx3/devices.c
@@ -36,7 +36,7 @@ static struct resource uart0[] = {
         },
 };
 
-static struct platform_device mxc_uart_device0 = {
+struct platform_device mxc_uart_device0 = {
         .name = "imx-uart",
         .id = 0,
         .resource = uart0,
@@ -55,7 +55,7 @@ static struct resource uart1[] = {
         },
 };
 
-static struct platform_device mxc_uart_device1 = {
+struct platform_device mxc_uart_device1 = {
         .name = "imx-uart",
         .id = 1,
         .resource = uart1,
@@ -74,7 +74,7 @@ static struct resource uart2[] = {
         },
 };
 
-static struct platform_device mxc_uart_device2 = {
+struct platform_device mxc_uart_device2 = {
         .name = "imx-uart",
         .id = 2,
         .resource = uart2,
@@ -93,7 +93,7 @@ static struct resource uart3[] = {
         },
 };
 
-static struct platform_device mxc_uart_device3 = {
+struct platform_device mxc_uart_device3 = {
         .name = "imx-uart",
         .id = 3,
         .resource = uart3,
@@ -112,46 +112,13 @@ static struct resource uart4[] = {
         },
 };
 
-static struct platform_device mxc_uart_device4 = {
+struct platform_device mxc_uart_device4 = {
         .name = "imx-uart",
         .id = 4,
         .resource = uart4,
         .num_resources = ARRAY_SIZE(uart4),
 };
 
-/*
- * Register only those UARTs that physically exist
- */
-int __init imx_init_uart(int uart_no, struct imxuart_platform_data *pdata)
-{
-        switch (uart_no) {
-        case 0:
-                mxc_uart_device0.dev.platform_data = pdata;
-                platform_device_register(&mxc_uart_device0);
-                break;
-        case 1:
-                mxc_uart_device1.dev.platform_data = pdata;
-                platform_device_register(&mxc_uart_device1);
-                break;
-        case 2:
-                mxc_uart_device2.dev.platform_data = pdata;
-                platform_device_register(&mxc_uart_device2);
-                break;
-        case 3:
-                mxc_uart_device3.dev.platform_data = pdata;
-                platform_device_register(&mxc_uart_device3);
-                break;
-        case 4:
-                mxc_uart_device4.dev.platform_data = pdata;
-                platform_device_register(&mxc_uart_device4);
-                break;
-        default:
-                return -ENODEV;
-        }
-
-        return 0;
-}
-
 /* GPIO port description */
 static struct mxc_gpio_port imx_gpio_ports[] = {
         [0] = {
diff --git a/arch/arm/mach-mx3/devices.h b/arch/arm/mach-mx3/devices.h
new file mode 100644
index 000000000000..4dc03f9e6001
--- /dev/null
+++ b/arch/arm/mach-mx3/devices.h
@@ -0,0 +1,6 @@
+
+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;
diff --git a/arch/arm/mach-mx3/pcm037.c b/arch/arm/mach-mx3/pcm037.c
index 0a152ed15a85..03374f9e0000 100644
--- a/arch/arm/mach-mx3/pcm037.c
+++ b/arch/arm/mach-mx3/pcm037.c
@@ -33,6 +33,8 @@
 #include <mach/iomux-mx3.h>
 #include <mach/board-pcm037.h>
 
+#include "devices.h"
+
 static struct physmap_flash_data pcm037_flash_data = {
         .width  = 2,
 };
@@ -73,12 +75,12 @@ static void __init mxc_board_init(void)
         mxc_iomux_mode(MX31_PIN_TXD1__TXD1);
         mxc_iomux_mode(MX31_PIN_RXD1__RXD1);
 
-        imx_init_uart(0, &uart_pdata);
+        mxc_register_device(&mxc_uart_device0, &uart_pdata);
 
         mxc_iomux_mode(MX31_PIN_CSPI3_MOSI__RXD3);
         mxc_iomux_mode(MX31_PIN_CSPI3_MISO__TXD3);
 
-        imx_init_uart(2, &uart_pdata);
+        mxc_register_device(&mxc_uart_device2, &uart_pdata);
 }
 
 /*