omap4: mmc driver support on OMAP4

Add basic support for all 5 MMC controllers on OMAP4.

This patch doesn't include mmc-regulator support

Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Acked-by: Madhusudhan Chikkature <madhu.cr@ti.com>
Cc: Russell King <linux@arm.linux.org.uk>
Acked-by: Tony Lindgren <tony@atomide.com>
Cc: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Cc: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 37 insertions, 5 deletions

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index a2e915639b72..92009a4c6c86 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -397,7 +397,7 @@ static inline void omap_init_sha1_md5(void) { }
 
 /*-------------------------------------------------------------------------*/
 
-#ifdef CONFIG_ARCH_OMAP3
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
 
 #define MMCHS_SYSCONFIG                 0x0010
 #define MMCHS_SYSCONFIG_SWRESET         (1 << 1)
@@ -424,8 +424,8 @@ static struct platform_device dummy_pdev = {
  **/
 static void __init omap_hsmmc_reset(void)
 {
-        u32 i, nr_controllers = cpu_is_omap34xx() ? OMAP34XX_NR_MMC :
-                OMAP24XX_NR_MMC;
+        u32 i, nr_controllers = cpu_is_omap44xx() ? OMAP44XX_NR_MMC :
+                (cpu_is_omap34xx() ? OMAP34XX_NR_MMC : OMAP24XX_NR_MMC);
 
         for (i = 0; i < nr_controllers; i++) {
                 u32 v, base = 0;
@@ -442,8 +442,21 @@ static void __init omap_hsmmc_reset(void)
                 case 2:
                         base = OMAP3_MMC3_BASE;
                         break;
+                case 3:
+                        if (!cpu_is_omap44xx())
+                                return;
+                        base = OMAP4_MMC4_BASE;
+                        break;
+                case 4:
+                        if (!cpu_is_omap44xx())
+                                return;
+                        base = OMAP4_MMC5_BASE;
+                        break;
                 }
 
+                if (cpu_is_omap44xx())
+                        base += OMAP4_MMC_REG_OFFSET;
+
                 dummy_pdev.id = i;
                 dev_set_name(&dummy_pdev.dev, "mmci-omap-hs.%d", i);
                 iclk = clk_get(dev, "ick");
@@ -581,11 +594,23 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
                         irq = INT_24XX_MMC2_IRQ;
                         break;
                 case 2:
-                        if (!cpu_is_omap34xx())
+                        if (!cpu_is_omap44xx() && !cpu_is_omap34xx())
                                 return;
                         base = OMAP3_MMC3_BASE;
                         irq = INT_34XX_MMC3_IRQ;
                         break;
+                case 3:
+                        if (!cpu_is_omap44xx())
+                                return;
+                        base = OMAP4_MMC4_BASE + OMAP4_MMC_REG_OFFSET;
+                        irq = INT_44XX_MMC4_IRQ;
+                        break;
+                case 4:
+                        if (!cpu_is_omap44xx())
+                                return;
+                        base = OMAP4_MMC5_BASE + OMAP4_MMC_REG_OFFSET;
+                        irq = INT_44XX_MMC5_IRQ;
+                        break;
                 default:
                         continue;
                 }
@@ -593,8 +618,15 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
                 if (cpu_is_omap2420()) {
                         size = OMAP2420_MMC_SIZE;
                         name = "mmci-omap";
+                } else if (cpu_is_omap44xx()) {
+                        if (i < 3) {
+                                base += OMAP4_MMC_REG_OFFSET;
+                                irq += IRQ_GIC_START;
+                        }
+                        size = OMAP4_HSMMC_SIZE;
+                        name = "mmci-omap-hs";
                 } else {
-                        size = HSMMC_SIZE;
+                        size = OMAP3_HSMMC_SIZE;
                         name = "mmci-omap-hs";
                 }
                 omap_mmc_add(name, i, base, size, irq, mmc_data[i]);