3 files changed, 50 insertions, 1 deletions

diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c
index 7cfdef0aad45..b7d4900b02e4 100644
--- a/arch/arm/mach-mx3/devices.c
+++ b/arch/arm/mach-mx3/devices.c
@@ -242,3 +242,51 @@ struct platform_device mxc_i2c_device2 = {
         .num_resources = ARRAY_SIZE(mxc_i2c2_resources),
         .resource = mxc_i2c2_resources,
 };
+
+/* i.MX31 Image Processing Unit */
+
+/* The resource order is important! */
+static struct resource mx3_ipu_rsrc[] = {
+        {
+                .start = IPU_CTRL_BASE_ADDR,
+                .end = IPU_CTRL_BASE_ADDR + 0x5F,
+                .flags = IORESOURCE_MEM,
+        }, {
+                .start = IPU_CTRL_BASE_ADDR + 0x88,
+                .end = IPU_CTRL_BASE_ADDR + 0xB3,
+                .flags = IORESOURCE_MEM,
+        }, {
+                .start = MXC_INT_IPU_SYN,
+                .end = MXC_INT_IPU_SYN,
+                .flags = IORESOURCE_IRQ,
+        }, {
+                .start = MXC_INT_IPU_ERR,
+                .end = MXC_INT_IPU_ERR,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+struct platform_device mx3_ipu = {
+        .name = "ipu-core",
+        .id = -1,
+        .num_resources = ARRAY_SIZE(mx3_ipu_rsrc),
+        .resource = mx3_ipu_rsrc,
+};
+
+static struct resource fb_resources[] = {
+        {
+                .start  = IPU_CTRL_BASE_ADDR + 0xB4,
+                .end    = IPU_CTRL_BASE_ADDR + 0x1BF,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+struct platform_device mx3_fb = {
+        .name           = "mx3_sdc_fb",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(fb_resources),
+        .resource       = fb_resources,
+        .dev            = {
+                .coherent_dma_mask = 0xffffffff,
+       },
+};
diff --git a/arch/arm/mach-mx3/devices.h b/arch/arm/mach-mx3/devices.h
index 077a90226a71..d1638518a9d6 100644
--- a/arch/arm/mach-mx3/devices.h
+++ b/arch/arm/mach-mx3/devices.h
@@ -9,3 +9,5 @@ extern struct platform_device mxc_nand_device;
 extern struct platform_device mxc_i2c_device0;
 extern struct platform_device mxc_i2c_device1;
 extern struct platform_device mxc_i2c_device2;
+extern struct platform_device mx3_ipu;
+extern struct platform_device mx3_fb;
diff --git a/arch/arm/mach-mx3/mx31moboard.c b/arch/arm/mach-mx3/mx31moboard.c
index 2d51739e24bf..b30460a2a559 100644
--- a/arch/arm/mach-mx3/mx31moboard.c
+++ b/arch/arm/mach-mx3/mx31moboard.c
@@ -101,7 +101,6 @@ static void __init mxc_board_init(void)
         default:
                 printk(KERN_ERR "Illegal mx31moboard_baseboard type %d\n", mx31moboard_baseboard);
         }
-
 }
 
 /*