Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (422 commits)
  [ARM] 5435/1: fix compile warning in sanity_check_meminfo()
  [ARM] 5434/1: ARM: OMAP: Fix mailbox compile for 24xx
  [ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0
  [ARM] pxa: fix Colibri PXA300 and PXA320 LCD backlight pins
  imxfb: Fix TFT mode
  i.MX21/27: remove ifdef CONFIG_FB_IMX
  imxfb: add clock support
  mxc: add arch_reset() function
  clkdev: add possibility to get a clock based on the device name
  i.MX1: remove fb support from mach-imx
  [ARM] pxa: build arch/arm/plat-pxa/mfp.c only when PXA3xx or ARCH_MMP defined
  Gemini: Add support for Teltonika RUT100
  Gemini: gpiolib based GPIO support v2
  MAINTAINERS: add myself as Gemini architecture maintainer
  ARM: Add Gemini architecture v3
  [ARM] OMAP: Fix compile for omap2_init_common_hw()
  MAINTAINERS: Add myself as Faraday ARM core variant maintainer
  ARM: Add support for FA526 v2
  [ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h
  [ARM] collie: fix two minor formatting nits
  ...

1 files changed, 141 insertions, 11 deletions

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index ce03fa750775..d6b4b2f8722f 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -28,13 +28,121 @@
 #include <mach/eac.h>
 #include <mach/mmc.h>
 
-#if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)
-#define OMAP2_MBOX_BASE         IO_ADDRESS(OMAP24XX_MAILBOX_BASE)
+#if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)
 
-static struct resource mbox_resources[] = {
+static struct resource cam_resources[] = {
         {
-                .start          = OMAP2_MBOX_BASE,
-                .end            = OMAP2_MBOX_BASE + 0x11f,
+                .start          = OMAP24XX_CAMERA_BASE,
+                .end            = OMAP24XX_CAMERA_BASE + 0xfff,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = INT_24XX_CAM_IRQ,
+                .flags          = IORESOURCE_IRQ,
+        }
+};
+
+static struct platform_device omap_cam_device = {
+        .name           = "omap24xxcam",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(cam_resources),
+        .resource       = cam_resources,
+};
+
+static inline void omap_init_camera(void)
+{
+        platform_device_register(&omap_cam_device);
+}
+
+#elif defined(CONFIG_VIDEO_OMAP3) || defined(CONFIG_VIDEO_OMAP3_MODULE)
+
+static struct resource omap3isp_resources[] = {
+        {
+                .start          = OMAP3430_ISP_BASE,
+                .end            = OMAP3430_ISP_END,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = OMAP3430_ISP_CBUFF_BASE,
+                .end            = OMAP3430_ISP_CBUFF_END,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = OMAP3430_ISP_CCP2_BASE,
+                .end            = OMAP3430_ISP_CCP2_END,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = OMAP3430_ISP_CCDC_BASE,
+                .end            = OMAP3430_ISP_CCDC_END,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = OMAP3430_ISP_HIST_BASE,
+                .end            = OMAP3430_ISP_HIST_END,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = OMAP3430_ISP_H3A_BASE,
+                .end            = OMAP3430_ISP_H3A_END,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = OMAP3430_ISP_PREV_BASE,
+                .end            = OMAP3430_ISP_PREV_END,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = OMAP3430_ISP_RESZ_BASE,
+                .end            = OMAP3430_ISP_RESZ_END,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = OMAP3430_ISP_SBL_BASE,
+                .end            = OMAP3430_ISP_SBL_END,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = OMAP3430_ISP_CSI2A_BASE,
+                .end            = OMAP3430_ISP_CSI2A_END,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = OMAP3430_ISP_CSI2PHY_BASE,
+                .end            = OMAP3430_ISP_CSI2PHY_END,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = INT_34XX_CAM_IRQ,
+                .flags          = IORESOURCE_IRQ,
+        }
+};
+
+static struct platform_device omap3isp_device = {
+        .name           = "omap3isp",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(omap3isp_resources),
+        .resource       = omap3isp_resources,
+};
+
+static inline void omap_init_camera(void)
+{
+        platform_device_register(&omap3isp_device);
+}
+#else
+static inline void omap_init_camera(void)
+{
+}
+#endif
+
+#if defined(CONFIG_OMAP_MBOX_FWK) || defined(CONFIG_OMAP_MBOX_FWK_MODULE)
+
+#define MBOX_REG_SIZE   0x120
+
+static struct resource omap2_mbox_resources[] = {
+        {
+                .start          = OMAP24XX_MAILBOX_BASE,
+                .end            = OMAP24XX_MAILBOX_BASE + MBOX_REG_SIZE - 1,
                 .flags          = IORESOURCE_MEM,
         },
         {
@@ -47,20 +155,40 @@ static struct resource mbox_resources[] = {
         },
 };
 
+static struct resource omap3_mbox_resources[] = {
+        {
+                .start          = OMAP34XX_MAILBOX_BASE,
+                .end            = OMAP34XX_MAILBOX_BASE + MBOX_REG_SIZE - 1,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = INT_24XX_MAIL_U0_MPU,
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+
 static struct platform_device mbox_device = {
-        .name           = "mailbox",
+        .name           = "omap2-mailbox",
         .id             = -1,
-        .num_resources  = ARRAY_SIZE(mbox_resources),
-        .resource       = mbox_resources,
 };
 
 static inline void omap_init_mbox(void)
 {
+        if (cpu_is_omap2420()) {
+                mbox_device.num_resources = ARRAY_SIZE(omap2_mbox_resources);
+                mbox_device.resource = omap2_mbox_resources;
+        } else if (cpu_is_omap3430()) {
+                mbox_device.num_resources = ARRAY_SIZE(omap3_mbox_resources);
+                mbox_device.resource = omap3_mbox_resources;
+        } else {
+                pr_err("%s: platform not supported\n", __func__);
+                return;
+        }
         platform_device_register(&mbox_device);
 }
 #else
 static inline void omap_init_mbox(void) { }
-#endif
+#endif /* CONFIG_OMAP_MBOX_FWK */
 
 #if defined(CONFIG_OMAP_STI)
 
@@ -348,11 +476,12 @@ static void __init omap_hsmmc_reset(void)
                 }
 
                 dummy_pdev.id = i;
-                iclk = clk_get(dev, "mmchs_ick");
+                dev_set_name(&dummy_pdev.dev, "mmci-omap-hs.%d", i);
+                iclk = clk_get(dev, "ick");
                 if (iclk && clk_enable(iclk))
                         iclk = NULL;
 
-                fclk = clk_get(dev, "mmchs_fck");
+                fclk = clk_get(dev, "fck");
                 if (fclk && clk_enable(fclk))
                         fclk = NULL;
 
@@ -506,6 +635,7 @@ static int __init omap2_init_devices(void)
          * in alphabetical order so they're easier to sort through.
          */
         omap_hsmmc_reset();
+        omap_init_camera();
         omap_init_mbox();
         omap_init_mcspi();
         omap_hdq_init();