26 files changed, 112 insertions, 208 deletions

diff --git a/arch/arm/mach-mx3/Kconfig b/arch/arm/mach-mx3/Kconfig
index ae23211dbadc..cb7d4a3a092a 100644
--- a/arch/arm/mach-mx3/Kconfig
+++ b/arch/arm/mach-mx3/Kconfig
@@ -56,6 +56,7 @@ config MACH_PCM037
         select IMX_HAVE_PLATFORM_IMX2_WDT
         select IMX_HAVE_PLATFORM_IMX_I2C
         select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_IPU_CORE
         select IMX_HAVE_PLATFORM_MXC_EHCI
         select IMX_HAVE_PLATFORM_MXC_MMC
         select IMX_HAVE_PLATFORM_MXC_NAND
@@ -99,6 +100,7 @@ config MACH_MX31_3DS
         select IMX_HAVE_PLATFORM_IMX_I2C
         select IMX_HAVE_PLATFORM_IMX_KEYPAD
         select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_IPU_CORE
         select IMX_HAVE_PLATFORM_MXC_EHCI
         select IMX_HAVE_PLATFORM_MXC_NAND
         select IMX_HAVE_PLATFORM_SPI_IMX
@@ -122,6 +124,7 @@ config MACH_MX31MOBOARD
         select IMX_HAVE_PLATFORM_FSL_USB2_UDC
         select IMX_HAVE_PLATFORM_IMX_I2C
         select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_IPU_CORE
         select IMX_HAVE_PLATFORM_MXC_EHCI
         select IMX_HAVE_PLATFORM_MXC_MMC
         select IMX_HAVE_PLATFORM_SPI_IMX
@@ -134,6 +137,7 @@ config MACH_MX31LILLY
         bool "Support MX31 LILLY-1131 platforms (INCO startec)"
         select SOC_IMX31
         select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_IPU_CORE
         select IMX_HAVE_PLATFORM_MXC_EHCI
         select IMX_HAVE_PLATFORM_MXC_MMC
         select IMX_HAVE_PLATFORM_SPI_IMX
@@ -159,6 +163,7 @@ config MACH_PCM043
         select IMX_HAVE_PLATFORM_IMX_I2C
         select IMX_HAVE_PLATFORM_IMX_SSI
         select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_IPU_CORE
         select IMX_HAVE_PLATFORM_MXC_EHCI
         select IMX_HAVE_PLATFORM_MXC_NAND
         select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
@@ -173,6 +178,7 @@ config MACH_ARMADILLO5X0
         select IMX_HAVE_PLATFORM_GPIO_KEYS
         select IMX_HAVE_PLATFORM_IMX_I2C
         select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_IPU_CORE
         select IMX_HAVE_PLATFORM_MXC_EHCI
         select IMX_HAVE_PLATFORM_MXC_MMC
         select IMX_HAVE_PLATFORM_MXC_NAND
@@ -238,6 +244,7 @@ config MACH_EUKREA_MBIMXSD35_BASEBOARD
         bool "Eukrea MBIMXSD development board"
         select IMX_HAVE_PLATFORM_GPIO_KEYS
         select IMX_HAVE_PLATFORM_IMX_SSI
+        select IMX_HAVE_PLATFORM_IPU_CORE
         help
           This adds board specific devices that can be found on Eukrea's
           MBIMXSD evaluation board.
@@ -252,6 +259,7 @@ config MACH_VPR200
         select IMX_HAVE_PLATFORM_IMX2_WDT
         select IMX_HAVE_PLATFORM_IMX_UART
         select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_IPU_CORE
         select IMX_HAVE_PLATFORM_MXC_EHCI
         select IMX_HAVE_PLATFORM_MXC_NAND
         select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
diff --git a/arch/arm/mach-mx3/Makefile b/arch/arm/mach-mx3/Makefile
index a54faf2cf5fa..15a7ff826ce7 100644
--- a/arch/arm/mach-mx3/Makefile
+++ b/arch/arm/mach-mx3/Makefile
@@ -4,7 +4,7 @@
 
 # Object file lists.
 
-obj-y                           := mm.o devices.o cpu.o
+obj-y                           := mm.o cpu.o
 obj-$(CONFIG_SOC_IMX31)         += clock-imx31.o iomux-imx31.o ehci-imx31.o
 obj-$(CONFIG_SOC_IMX35)         += clock-imx35.o ehci-imx35.o
 obj-$(CONFIG_MACH_MX31ADS)      += mach-mx31ads.o
diff --git a/arch/arm/mach-mx3/devices-imx31.h b/arch/arm/mach-mx3/devices-imx31.h
index 3059b3e33dec..dbe940d9c53a 100644
--- a/arch/arm/mach-mx3/devices-imx31.h
+++ b/arch/arm/mach-mx3/devices-imx31.h
@@ -41,6 +41,14 @@ extern const struct imx_imx_uart_1irq_data imx31_imx_uart_data[];
 #define imx31_add_imx_uart3(pdata)      imx31_add_imx_uart(3, pdata)
 #define imx31_add_imx_uart4(pdata)      imx31_add_imx_uart(4, pdata)
 
+extern const struct imx_ipu_core_data imx31_ipu_core_data;
+#define imx31_add_ipu_core(pdata)       \
+        imx_add_ipu_core(&imx31_ipu_core_data, pdata)
+#define imx31_alloc_mx3_camera(pdata)   \
+        imx_alloc_mx3_camera(&imx31_ipu_core_data, pdata)
+#define imx31_add_mx3_sdc_fb(pdata)     \
+        imx_add_mx3_sdc_fb(&imx31_ipu_core_data, pdata)
+
 extern const struct imx_mxc_ehci_data imx31_mxc_ehci_otg_data;
 #define imx31_add_mxc_ehci_otg(pdata)   \
         imx_add_mxc_ehci(&imx31_mxc_ehci_otg_data, pdata)
diff --git a/arch/arm/mach-mx3/devices-imx35.h b/arch/arm/mach-mx3/devices-imx35.h
index 35826656e599..234cbd3c18af 100644
--- a/arch/arm/mach-mx3/devices-imx35.h
+++ b/arch/arm/mach-mx3/devices-imx35.h
@@ -49,6 +49,14 @@ extern const struct imx_imx_uart_1irq_data imx35_imx_uart_data[];
 #define imx35_add_imx_uart1(pdata)      imx35_add_imx_uart(1, pdata)
 #define imx35_add_imx_uart2(pdata)      imx35_add_imx_uart(2, pdata)
 
+extern const struct imx_ipu_core_data imx35_ipu_core_data;
+#define imx35_add_ipu_core(pdata)       \
+        imx_add_ipu_core(&imx35_ipu_core_data, pdata)
+#define imx35_alloc_mx3_camera(pdata)   \
+        imx_alloc_mx3_camera(&imx35_ipu_core_data, pdata)
+#define imx35_add_mx3_sdc_fb(pdata)     \
+        imx_add_mx3_sdc_fb(&imx35_ipu_core_data, pdata)
+
 extern const struct imx_mxc_ehci_data imx35_mxc_ehci_otg_data;
 #define imx35_add_mxc_ehci_otg(pdata)   \
         imx_add_mxc_ehci(&imx35_mxc_ehci_otg_data, pdata)
diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c
deleted file mode 100644
index 0701ee45c548..000000000000
--- a/arch/arm/mach-mx3/devices.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2006-2007 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Sascha Hauer, kernel@pengutronix.de
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301, USA.
- */
-
-#include <linux/dma-mapping.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/serial.h>
-#include <linux/gpio.h>
-#include <mach/hardware.h>
-#include <mach/irqs.h>
-#include <mach/common.h>
-#include <mach/mx3_camera.h>
-
-#include "devices.h"
-
-/* i.MX31 Image Processing Unit */
-
-/* The resource order is important! */
-static struct resource mx3_ipu_rsrc[] = {
-        {
-                .start = MX3x_IPU_CTRL_BASE_ADDR,
-                .end = MX3x_IPU_CTRL_BASE_ADDR + 0x5F,
-                .flags = IORESOURCE_MEM,
-        }, {
-                .start = MX3x_IPU_CTRL_BASE_ADDR + 0x88,
-                .end = MX3x_IPU_CTRL_BASE_ADDR + 0xB3,
-                .flags = IORESOURCE_MEM,
-        }, {
-                .start = MX3x_INT_IPU_SYN,
-                .end = MX3x_INT_IPU_SYN,
-                .flags = IORESOURCE_IRQ,
-        }, {
-                .start = MX3x_INT_IPU_ERR,
-                .end = MX3x_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  = MX3x_IPU_CTRL_BASE_ADDR + 0xB4,
-                .end    = MX3x_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 = DMA_BIT_MASK(32),
-       },
-};
-
-static struct resource camera_resources[] = {
-        {
-                .start  = MX3x_IPU_CTRL_BASE_ADDR + 0x60,
-                .end    = MX3x_IPU_CTRL_BASE_ADDR + 0x87,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-struct platform_device mx3_camera = {
-        .name           = "mx3-camera",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(camera_resources),
-        .resource       = camera_resources,
-        .dev            = {
-                .coherent_dma_mask = DMA_BIT_MASK(32),
-        },
-};
diff --git a/arch/arm/mach-mx3/devices.h b/arch/arm/mach-mx3/devices.h
deleted file mode 100644
index d23f85375655..000000000000
--- a/arch/arm/mach-mx3/devices.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct platform_device mx3_ipu;
-extern struct platform_device mx3_fb;
-extern struct platform_device mx3_camera;
diff --git a/arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c b/arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c
index f61b2a923826..4909ea05855a 100644
--- a/arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c
+++ b/arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c
@@ -38,12 +38,9 @@
 #include <mach/hardware.h>
 #include <mach/common.h>
 #include <mach/iomux-mx35.h>
-#include <mach/ipu.h>
-#include <mach/mx3fb.h>
 #include <mach/audmux.h>
 
 #include "devices-imx35.h"
-#include "devices.h"
 
 static const struct fb_videomode fb_modedb[] = {
         {
@@ -98,12 +95,11 @@ static const struct fb_videomode fb_modedb[] = {
         },
 };
 
-static struct ipu_platform_data mx3_ipu_data = {
+static const struct ipu_platform_data mx3_ipu_data __initconst = {
         .irq_base = MXC_IPU_IRQ_START,
 };
 
-static struct mx3fb_platform_data mx3fb_pdata = {
-        .dma_dev        = &mx3_ipu.dev,
+static struct mx3fb_platform_data mx3fb_pdata __initdata = {
         .name           = "CMO-QVGA",
         .mode           = fb_modedb,
         .num_modes      = ARRAY_SIZE(fb_modedb),
@@ -280,8 +276,8 @@ void __init eukrea_mbimxsd35_baseboard_init(void)
 #endif
 
         imx35_add_imx_uart1(&uart_pdata);
-        mxc_register_device(&mx3_ipu, &mx3_ipu_data);
-        mxc_register_device(&mx3_fb, &mx3fb_pdata);
+        imx35_add_ipu_core(&mx3_ipu_data);
+        imx35_add_mx3_sdc_fb(&mx3fb_pdata);
 
         imx35_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata);
 
diff --git a/arch/arm/mach-mx3/mach-armadillo5x0.c b/arch/arm/mach-mx3/mach-armadillo5x0.c
index ace0c4c3b662..8e614b10dd5c 100644
--- a/arch/arm/mach-mx3/mach-armadillo5x0.c
+++ b/arch/arm/mach-mx3/mach-armadillo5x0.c
@@ -48,12 +48,9 @@
 
 #include <mach/common.h>
 #include <mach/iomux-mx3.h>
-#include <mach/ipu.h>
-#include <mach/mx3fb.h>
 #include <mach/ulpi.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 #include "crm_regs.h"
 
 static int armadillo5x0_pins[] = {
@@ -374,12 +371,11 @@ static const struct fb_videomode fb_modedb[] = {
         },
 };
 
-static struct ipu_platform_data mx3_ipu_data = {
+static const struct ipu_platform_data mx3_ipu_data __initconst = {
         .irq_base = MXC_IPU_IRQ_START,
 };
 
-static struct mx3fb_platform_data mx3fb_pdata = {
-        .dma_dev        = &mx3_ipu.dev,
+static struct mx3fb_platform_data mx3fb_pdata __initdata = {
         .name           = "CRT-VGA",
         .mode           = fb_modedb,
         .num_modes      = ARRAY_SIZE(fb_modedb),
@@ -512,8 +508,8 @@ static void __init armadillo5x0_init(void)
         imx31_add_mxc_mmc(0, &sdhc_pdata);
 
         /* Register FB */
-        mxc_register_device(&mx3_ipu, &mx3_ipu_data);
-        mxc_register_device(&mx3_fb, &mx3fb_pdata);
+        imx31_add_ipu_core(&mx3_ipu_data);
+        imx31_add_mx3_sdc_fb(&mx3fb_pdata);
 
         /* Register NOR Flash */
         mxc_register_device(&armadillo5x0_nor_flash,
diff --git a/arch/arm/mach-mx3/mach-cpuimx35.c b/arch/arm/mach-mx3/mach-cpuimx35.c
index ae13fd73a810..3f8ef825fa6f 100644
--- a/arch/arm/mach-mx3/mach-cpuimx35.c
+++ b/arch/arm/mach-mx3/mach-cpuimx35.c
@@ -43,7 +43,6 @@
 #include <mach/iomux-mx35.h>
 
 #include "devices-imx35.h"
-#include "devices.h"
 
 static const struct imxuart_platform_data uart_pdata __initconst = {
         .flags = IMXUART_HAVE_RTSCTS,
diff --git a/arch/arm/mach-mx3/mach-kzm_arm11_01.c b/arch/arm/mach-mx3/mach-kzm_arm11_01.c
index d35621d62b4d..1ecae20cf4e3 100644
--- a/arch/arm/mach-mx3/mach-kzm_arm11_01.c
+++ b/arch/arm/mach-mx3/mach-kzm_arm11_01.c
@@ -39,7 +39,6 @@
 #include <mach/iomux-mx3.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 #define KZM_ARM11_IO_ADDRESS(x) (IOMEM(                                 \
         IMX_IO_P2V_MODULE(x, MX31_CS4) ?:                               \
diff --git a/arch/arm/mach-mx3/mach-mx31_3ds.c b/arch/arm/mach-mx3/mach-mx31_3ds.c
index 477b2d274396..9b982449cb52 100644
--- a/arch/arm/mach-mx3/mach-mx31_3ds.c
+++ b/arch/arm/mach-mx3/mach-mx31_3ds.c
@@ -39,12 +39,8 @@
 #include <mach/iomux-mx3.h>
 #include <mach/3ds_debugboard.h>
 #include <mach/ulpi.h>
-#include <mach/ipu.h>
-#include <mach/mx3fb.h>
-#include <mach/mx3_camera.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 /* CPLD IRQ line for external uart, external ethernet etc */
 #define EXPIO_PARENT_INT        IOMUX_TO_IRQ(MX31_PIN_GPIO1_1)
@@ -177,22 +173,37 @@ static struct gpio mx31_3ds_camera_gpios[] = {
         { MX31_3DS_GPIO_CAMERA_RST, GPIOF_OUT_INIT_HIGH, "camera-reset" },
 };
 
-static int __init mx31_3ds_camera_alloc_dma(void)
+static const struct mx3_camera_pdata mx31_3ds_camera_pdata __initconst = {
+        .flags = MX3_CAMERA_DATAWIDTH_10,
+        .mclk_10khz = 2600,
+};
+
+static int __init mx31_3ds_init_camera(void)
 {
-        int dma;
+        int dma, ret = -ENOMEM;
+        struct platform_device *pdev =
+                imx31_alloc_mx3_camera(&mx31_3ds_camera_pdata);
+
+        if (IS_ERR(pdev))
+                return PTR_ERR(pdev);
 
         if (!mx3_camera_base)
-                return -ENOMEM;
+                goto err;
 
-        dma = dma_declare_coherent_memory(&mx3_camera.dev,
+        dma = dma_declare_coherent_memory(&pdev->dev,
                                         mx3_camera_base, mx3_camera_base,
                                         MX31_3DS_CAMERA_BUF_SIZE,
                                         DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE);
 
         if (!(dma & DMA_MEMORY_MAP))
-                return -ENOMEM;
+                goto err;
 
-        return 0;
+        ret = platform_device_add(pdev);
+        if (ret)
+err:
+                platform_device_put(pdev);
+
+        return ret;
 }
 
 static int mx31_3ds_camera_power(struct device *dev, int on)
@@ -240,12 +251,6 @@ static struct platform_device mx31_3ds_ov2640 = {
         },
 };
 
-struct mx3_camera_pdata mx31_3ds_camera_pdata = {
-        .dma_dev        = &mx3_ipu.dev,
-        .flags          = MX3_CAMERA_DATAWIDTH_10,
-        .mclk_10khz     = 2600,
-};
-
 /*
  * FB support
  */
@@ -272,8 +277,7 @@ static struct ipu_platform_data mx3_ipu_data = {
         .irq_base = MXC_IPU_IRQ_START,
 };
 
-static struct mx3fb_platform_data mx3fb_pdata = {
-        .dma_dev        = &mx3_ipu.dev,
+static struct mx3fb_platform_data mx3fb_pdata __initdata = {
         .name           = "Epson-VGA",
         .mode           = fb_modedb,
         .num_modes      = ARRAY_SIZE(fb_modedb),
@@ -722,8 +726,8 @@ static void __init mx31_3ds_init(void)
         imx31_add_mxc_mmc(0, &sdhc1_pdata);
 
         imx31_add_spi_imx0(&spi0_pdata);
-        mxc_register_device(&mx3_ipu, &mx3_ipu_data);
-        mxc_register_device(&mx3_fb, &mx3fb_pdata);
+        imx31_add_ipu_core(&mx3_ipu_data);
+        imx31_add_mx3_sdc_fb(&mx3fb_pdata);
 
         /* CSI */
         /* Camera power: default - off */
@@ -734,10 +738,7 @@ static void __init mx31_3ds_init(void)
                 iclink_ov2640.power = NULL;
         }
 
-        if (!mx31_3ds_camera_alloc_dma())
-                mxc_register_device(&mx3_camera, &mx31_3ds_camera_pdata);
-        else
-                pr_err("Failed to allocate dma memory for camera");
+        mx31_3ds_init_camera();
 }
 
 static void __init mx31_3ds_timer_init(void)
diff --git a/arch/arm/mach-mx3/mach-mx31ads.c b/arch/arm/mach-mx3/mach-mx31ads.c
index 3d095d69bc68..f4dee0254634 100644
--- a/arch/arm/mach-mx3/mach-mx31ads.c
+++ b/arch/arm/mach-mx3/mach-mx31ads.c
@@ -38,7 +38,6 @@
 #endif
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 /* PBC Board interrupt status register */
 #define PBC_INTSTATUS           0x000016
diff --git a/arch/arm/mach-mx3/mach-mx31lilly.c b/arch/arm/mach-mx3/mach-mx31lilly.c
index ed95745163b8..410e676ae087 100644
--- a/arch/arm/mach-mx3/mach-mx31lilly.c
+++ b/arch/arm/mach-mx3/mach-mx31lilly.c
@@ -46,7 +46,6 @@
 #include <mach/ulpi.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 /*
  * This file contains module-specific initialization routines for LILLY-1131.
diff --git a/arch/arm/mach-mx3/mach-mx31lite.c b/arch/arm/mach-mx3/mach-mx31lite.c
index 24a21a384bf1..ac9b4cad320e 100644
--- a/arch/arm/mach-mx3/mach-mx31lite.c
+++ b/arch/arm/mach-mx3/mach-mx31lite.c
@@ -44,7 +44,6 @@
 #include <mach/ulpi.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 /*
  * This file contains the module-specific initialization routines.
diff --git a/arch/arm/mach-mx3/mach-mx31moboard.c b/arch/arm/mach-mx3/mach-mx31moboard.c
index 6c13061b6ac2..eaaea2dbd4fd 100644
--- a/arch/arm/mach-mx3/mach-mx31moboard.c
+++ b/arch/arm/mach-mx3/mach-mx31moboard.c
@@ -40,12 +40,9 @@
 #include <mach/common.h>
 #include <mach/hardware.h>
 #include <mach/iomux-mx3.h>
-#include <mach/ipu.h>
-#include <mach/mx3_camera.h>
 #include <mach/ulpi.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 static unsigned int moboard_pins[] = {
         /* UART0 */
@@ -194,8 +191,8 @@ static struct regulator_init_data sdhc_vreg_data = {
 
 static struct regulator_consumer_supply cam_consumers[] = {
         {
-                .dev    = &mx3_camera.dev,
-                .supply = "cam_vcc",
+                .dev_name = "mx3_camera.0",
+                .supply = "cam_vcc",
         },
 };
 
@@ -458,7 +455,7 @@ static struct platform_device mx31moboard_leds_device = {
         },
 };
 
-static struct ipu_platform_data mx3_ipu_data = {
+static const struct ipu_platform_data mx3_ipu_data __initconst = {
         .irq_base = MXC_IPU_IRQ_START,
 };
 
@@ -467,8 +464,7 @@ static struct platform_device *devices[] __initdata = {
         &mx31moboard_leds_device,
 };
 
-static struct mx3_camera_pdata camera_pdata = {
-        .dma_dev        = &mx3_ipu.dev,
+static struct mx3_camera_pdata camera_pdata __initdata = {
         .flags          = MX3_CAMERA_DATAWIDTH_8 | MX3_CAMERA_DATAWIDTH_10,
         .mclk_10khz     = 4800,
 };
@@ -476,18 +472,31 @@ static struct mx3_camera_pdata camera_pdata = {
 static phys_addr_t mx3_camera_base __initdata;
 #define MX3_CAMERA_BUF_SIZE SZ_4M
 
-static int __init mx31moboard_cam_alloc_dma(void)
+static int __init mx31moboard_init_cam(void)
 {
-        int dma;
+        int dma, ret = -ENOMEM;
+        struct platform_device *pdev;
+
+        imx31_add_ipu_core(&mx3_ipu_data);
 
+        pdev = imx31_alloc_mx3_camera(&camera_pdata);
+        if (IS_ERR(pdev))
+                return PTR_ERR(pdev);
 
-        dma = dma_declare_coherent_memory(&mx3_camera.dev,
+        dma = dma_declare_coherent_memory(&pdev->dev,
                                         mx3_camera_base, mx3_camera_base,
                                         MX3_CAMERA_BUF_SIZE,
                                         DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE);
+        if (!(dma & DMA_MEMORY_MAP))
+                goto err;
+
+        ret = platform_device_add(pdev);
+        if (ret)
+err:
+                platform_device_put(pdev);
+
+        return ret;
 
-        /* The way we call dma_declare_coherent_memory only a malloc can fail */
-        return dma & DMA_MEMORY_MAP ? 0 : -ENOMEM;
 }
 
 static int mx31moboard_baseboard;
@@ -519,9 +528,7 @@ static void __init mx31moboard_init(void)
 
         imx31_add_mxc_mmc(0, &sdhc1_pdata);
 
-        mxc_register_device(&mx3_ipu, &mx3_ipu_data);
-        if (!mx31moboard_cam_alloc_dma())
-                mxc_register_device(&mx3_camera, &camera_pdata);
+        mx31moboard_init_cam();
 
         usb_xcvr_reset();
 
diff --git a/arch/arm/mach-mx3/mach-mx35_3ds.c b/arch/arm/mach-mx3/mach-mx35_3ds.c
index ff5fe231b8d6..882880ac1bbc 100644
--- a/arch/arm/mach-mx3/mach-mx35_3ds.c
+++ b/arch/arm/mach-mx3/mach-mx35_3ds.c
@@ -42,7 +42,6 @@
 #include <mach/3ds_debugboard.h>
 
 #include "devices-imx35.h"
-#include "devices.h"
 
 #define EXPIO_PARENT_INT        (MXC_INTERNAL_IRQS + GPIO_PORTA + 1)
 
diff --git a/arch/arm/mach-mx3/mach-pcm037.c b/arch/arm/mach-mx3/mach-pcm037.c
index 497b39b0f0e4..89c213b81295 100644
--- a/arch/arm/mach-mx3/mach-pcm037.c
+++ b/arch/arm/mach-mx3/mach-pcm037.c
@@ -42,13 +42,9 @@
 #include <mach/common.h>
 #include <mach/hardware.h>
 #include <mach/iomux-mx3.h>
-#include <mach/ipu.h>
-#include <mach/mx3_camera.h>
-#include <mach/mx3fb.h>
 #include <mach/ulpi.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 #include "pcm037.h"
 
 static enum pcm037_board_variant pcm037_instance = PCM037_PCM970;
@@ -405,8 +401,7 @@ static const struct imxmmc_platform_data sdhc_pdata __initconst = {
         .exit = pcm970_sdhc1_exit,
 };
 
-struct mx3_camera_pdata camera_pdata = {
-        .dma_dev        = &mx3_ipu.dev,
+struct mx3_camera_pdata camera_pdata __initdata = {
         .flags          = MX3_CAMERA_DATAWIDTH_8 | MX3_CAMERA_DATAWIDTH_10,
         .mclk_10khz     = 2000,
 };
@@ -414,17 +409,27 @@ struct mx3_camera_pdata camera_pdata = {
 static phys_addr_t mx3_camera_base __initdata;
 #define MX3_CAMERA_BUF_SIZE SZ_4M
 
-static int __init pcm037_camera_alloc_dma(void)
+static int __init pcm037_init_camera(void)
 {
-        int dma;
+        int dma, ret = -ENOMEM;
+        struct platform_device *pdev = imx31_alloc_mx3_camera(&camera_pdata);
 
-        dma = dma_declare_coherent_memory(&mx3_camera.dev,
+        if (IS_ERR(pdev))
+                return PTR_ERR(pdev);
+
+        dma = dma_declare_coherent_memory(&pdev->dev,
                                         mx3_camera_base, mx3_camera_base,
                                         MX3_CAMERA_BUF_SIZE,
                                         DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE);
+        if (!(dma & DMA_MEMORY_MAP))
+                goto err;
+
+        ret = platform_device_add(pdev);
+        if (ret)
+err:
+                platform_device_put(pdev);
 
-        /* The way we call dma_declare_coherent_memory only a malloc can fail */
-        return dma & DMA_MEMORY_MAP ? 0 : -ENOMEM;
+        return ret;
 }
 
 static struct platform_device *devices[] __initdata = {
@@ -434,7 +439,7 @@ static struct platform_device *devices[] __initdata = {
         &pcm037_mt9v022,
 };
 
-static struct ipu_platform_data mx3_ipu_data = {
+static const struct ipu_platform_data mx3_ipu_data __initconst = {
         .irq_base = MXC_IPU_IRQ_START,
 };
 
@@ -492,7 +497,6 @@ static const struct fb_videomode fb_modedb[] = {
 };
 
 static struct mx3fb_platform_data mx3fb_pdata = {
-        .dma_dev        = &mx3_ipu.dev,
         .name           = "Sharp-LQ035Q7DH06-QVGA",
         .mode           = fb_modedb,
         .num_modes      = ARRAY_SIZE(fb_modedb),
@@ -630,8 +634,8 @@ static void __init pcm037_init(void)
 
         imx31_add_mxc_nand(&pcm037_nand_board_info);
         imx31_add_mxc_mmc(0, &sdhc_pdata);
-        mxc_register_device(&mx3_ipu, &mx3_ipu_data);
-        mxc_register_device(&mx3_fb, &mx3fb_pdata);
+        imx31_add_ipu_core(&mx3_ipu_data);
+        imx31_add_mx3_sdc_fb(&mx3fb_pdata);
 
         /* CSI */
         /* Camera power: default - off */
@@ -641,8 +645,7 @@ static void __init pcm037_init(void)
         else
                 iclink_mt9t031.power = NULL;
 
-        if (!pcm037_camera_alloc_dma())
-                mxc_register_device(&mx3_camera, &camera_pdata);
+        pcm037_init_camera();
 
         platform_device_register(&pcm970_sja1000);
 
diff --git a/arch/arm/mach-mx3/mach-pcm037_eet.c b/arch/arm/mach-mx3/mach-pcm037_eet.c
index 20861d797841..1b7606bef8f4 100644
--- a/arch/arm/mach-mx3/mach-pcm037_eet.c
+++ b/arch/arm/mach-mx3/mach-pcm037_eet.c
@@ -17,7 +17,6 @@
 #include <asm/mach-types.h>
 
 #include "pcm037.h"
-#include "devices.h"
 #include "devices-imx31.h"
 
 static unsigned int pcm037_eet_pins[] = {
diff --git a/arch/arm/mach-mx3/mach-pcm043.c b/arch/arm/mach-mx3/mach-pcm043.c
index 9caf38be3928..10154cb15567 100644
--- a/arch/arm/mach-mx3/mach-pcm043.c
+++ b/arch/arm/mach-mx3/mach-pcm043.c
@@ -36,13 +36,10 @@
 #include <mach/hardware.h>
 #include <mach/common.h>
 #include <mach/iomux-mx35.h>
-#include <mach/ipu.h>
-#include <mach/mx3fb.h>
 #include <mach/ulpi.h>
 #include <mach/audmux.h>
 
 #include "devices-imx35.h"
-#include "devices.h"
 
 static const struct fb_videomode fb_modedb[] = {
         {
@@ -80,12 +77,11 @@ static const struct fb_videomode fb_modedb[] = {
         },
 };
 
-static struct ipu_platform_data mx3_ipu_data = {
+static const struct ipu_platform_data mx3_ipu_data __initconst = {
         .irq_base = MXC_IPU_IRQ_START,
 };
 
-static struct mx3fb_platform_data mx3fb_pdata = {
-        .dma_dev        = &mx3_ipu.dev,
+static struct mx3fb_platform_data mx3fb_pdata __initdata = {
         .name           = "Sharp-LQ035Q7",
         .mode           = fb_modedb,
         .num_modes      = ARRAY_SIZE(fb_modedb),
@@ -389,8 +385,8 @@ static void __init pcm043_init(void)
 
         imx35_add_imx_i2c0(&pcm043_i2c0_data);
 
-        mxc_register_device(&mx3_ipu, &mx3_ipu_data);
-        mxc_register_device(&mx3_fb, &mx3fb_pdata);
+        imx35_add_ipu_core(&mx3_ipu_data);
+        imx35_add_mx3_sdc_fb(&mx3fb_pdata);
 
         if (otg_mode_host) {
                 otg_pdata.otg = imx_otg_ulpi_create(ULPI_OTG_DRVVBUS |
diff --git a/arch/arm/mach-mx3/mach-qong.c b/arch/arm/mach-mx3/mach-qong.c
index 17f758b77623..a6052872ffb8 100644
--- a/arch/arm/mach-mx3/mach-qong.c
+++ b/arch/arm/mach-mx3/mach-qong.c
@@ -33,7 +33,6 @@
 #include <mach/iomux-mx3.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 /* FPGA defines */
 #define QONG_FPGA_VERSION(major, minor, rev)    \
diff --git a/arch/arm/mach-mx3/mach-vpr200.c b/arch/arm/mach-mx3/mach-vpr200.c
index dab34c508256..d74e3473d236 100644
--- a/arch/arm/mach-mx3/mach-vpr200.c
+++ b/arch/arm/mach-mx3/mach-vpr200.c
@@ -32,15 +32,12 @@
 #include <mach/common.h>
 #include <mach/iomux-mx35.h>
 #include <mach/irqs.h>
-#include <mach/ipu.h>
-#include <mach/mx3fb.h>
 
 #include <linux/i2c.h>
 #include <linux/i2c/at24.h>
 #include <linux/mfd/mc13xxx.h>
 
 #include "devices-imx35.h"
-#include "devices.h"
 
 #define GPIO_LCDPWR     IMX_GPIO_NR(1, 2)
 #define GPIO_PMIC_INT   IMX_GPIO_NR(2, 0)
@@ -90,12 +87,11 @@ static const struct fb_videomode fb_modedb[] = {
         }
 };
 
-static struct ipu_platform_data mx3_ipu_data = {
+static const struct ipu_platform_data mx3_ipu_data __initconst = {
         .irq_base = MXC_IPU_IRQ_START,
 };
 
-static struct mx3fb_platform_data mx3fb_pdata = {
-        .dma_dev        = &mx3_ipu.dev,
+static struct mx3fb_platform_data mx3fb_pdata __initdata = {
         .name           = "PT0708048",
         .mode           = fb_modedb,
         .num_modes      = ARRAY_SIZE(fb_modedb),
@@ -292,8 +288,8 @@ static void __init vpr200_board_init(void)
         imx35_add_imx_uart0(NULL);
         imx35_add_imx_uart2(NULL);
 
-        mxc_register_device(&mx3_ipu, &mx3_ipu_data);
-        mxc_register_device(&mx3_fb, &mx3fb_pdata);
+        imx35_add_ipu_core(&mx3_ipu_data);
+        imx35_add_mx3_sdc_fb(&mx3fb_pdata);
 
         imx35_add_fsl_usb2_udc(&otg_device_pdata);
         imx35_add_mxc_ehci_hs(&usb_host_pdata);
diff --git a/arch/arm/mach-mx3/mx31lilly-db.c b/arch/arm/mach-mx3/mx31lilly-db.c
index 8f1a38ebf5c8..e70f4527c918 100644
--- a/arch/arm/mach-mx3/mx31lilly-db.c
+++ b/arch/arm/mach-mx3/mx31lilly-db.c
@@ -34,11 +34,8 @@
 #include <mach/common.h>
 #include <mach/iomux-mx3.h>
 #include <mach/board-mx31lilly.h>
-#include <mach/mx3fb.h>
-#include <mach/ipu.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 /*
  * This file contains board-specific initialization routines for the
@@ -164,7 +161,7 @@ static const struct imxmmc_platform_data mmc_pdata __initconst = {
 };
 
 /* Framebuffer support */
-static struct ipu_platform_data ipu_data __initdata = {
+static const struct ipu_platform_data ipu_data __initconst = {
         .irq_base = MXC_IPU_IRQ_START,
 };
 
@@ -187,7 +184,6 @@ static const struct fb_videomode fb_modedb = {
 };
 
 static struct mx3fb_platform_data fb_pdata __initdata = {
-        .dma_dev        = &mx3_ipu.dev,
         .name           = "CRT-VGA",
         .mode           = &fb_modedb,
         .num_modes      = 1,
@@ -202,8 +198,8 @@ static void __init mx31lilly_init_fb(void)
                 return;
         }
 
-        mxc_register_device(&mx3_ipu, &ipu_data);
-        mxc_register_device(&mx3_fb, &fb_pdata);
+        imx31_add_ipu_core(&ipu_data);
+        imx31_add_mx3_sdc_fb(&fb_pdata);
         gpio_direction_output(LCD_VCC_EN_GPIO, 1);
 }
 
diff --git a/arch/arm/mach-mx3/mx31lite-db.c b/arch/arm/mach-mx3/mx31lite-db.c
index 04fab659947c..5aa053edc17c 100644
--- a/arch/arm/mach-mx3/mx31lite-db.c
+++ b/arch/arm/mach-mx3/mx31lite-db.c
@@ -37,7 +37,6 @@
 #include <mach/board-mx31lite.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 /*
  * This file contains board-specific initialization routines for the
diff --git a/arch/arm/mach-mx3/mx31moboard-devboard.c b/arch/arm/mach-mx3/mx31moboard-devboard.c
index 6410b9c48a02..0aa25364360d 100644
--- a/arch/arm/mach-mx3/mx31moboard-devboard.c
+++ b/arch/arm/mach-mx3/mx31moboard-devboard.c
@@ -28,7 +28,6 @@
 #include <mach/ulpi.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 static unsigned int devboard_pins[] = {
         /* UART1 */
diff --git a/arch/arm/mach-mx3/mx31moboard-marxbot.c b/arch/arm/mach-mx3/mx31moboard-marxbot.c
index f3aa0ce497b2..bb639cbda4e5 100644
--- a/arch/arm/mach-mx3/mx31moboard-marxbot.c
+++ b/arch/arm/mach-mx3/mx31moboard-marxbot.c
@@ -32,7 +32,6 @@
 #include <media/soc_camera.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 static unsigned int marxbot_pins[] = {
         /* SDHC2 */
diff --git a/arch/arm/mach-mx3/mx31moboard-smartbot.c b/arch/arm/mach-mx3/mx31moboard-smartbot.c
index 35f806e737c1..fabb801e7994 100644
--- a/arch/arm/mach-mx3/mx31moboard-smartbot.c
+++ b/arch/arm/mach-mx3/mx31moboard-smartbot.c
@@ -32,7 +32,6 @@
 #include <media/soc_camera.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 static unsigned int smartbot_pins[] = {
         /* UART1 */