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>

2 files changed, 13 insertions, 3 deletions

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 6f20eb93554b..7cb057f3f883 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -132,11 +132,11 @@ config MMC_OMAP
 
 config MMC_OMAP_HS
         tristate "TI OMAP High Speed Multimedia Card Interface support"
-        depends on ARCH_OMAP2430 || ARCH_OMAP3
+        depends on ARCH_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4
         help
           This selects the TI OMAP High Speed Multimedia card Interface.
-          If you have an OMAP2430 or OMAP3 board with a Multimedia Card slot,
-          say Y or M here.
+          If you have an OMAP2430 or OMAP3 board or OMAP4 board with a
+          Multimedia Card slot, say Y or M here.
 
           If unsure, say N.
 
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index a4dd43f117f0..4487cc097911 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -109,6 +109,8 @@
 #define OMAP_MMC1_DEVID         0
 #define OMAP_MMC2_DEVID         1
 #define OMAP_MMC3_DEVID         2
+#define OMAP_MMC4_DEVID         3
+#define OMAP_MMC5_DEVID         4
 
 #define MMC_TIMEOUT_MS          20
 #define OMAP_MMC_MASTER_CLOCK   96000000
@@ -1758,6 +1760,14 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
                 host->dma_line_tx = OMAP34XX_DMA_MMC3_TX;
                 host->dma_line_rx = OMAP34XX_DMA_MMC3_RX;
                 break;
+        case OMAP_MMC4_DEVID:
+                host->dma_line_tx = OMAP44XX_DMA_MMC4_TX;
+                host->dma_line_rx = OMAP44XX_DMA_MMC4_RX;
+                break;
+        case OMAP_MMC5_DEVID:
+                host->dma_line_tx = OMAP44XX_DMA_MMC5_TX;
+                host->dma_line_rx = OMAP44XX_DMA_MMC5_RX;
+                break;
         default:
                 dev_err(mmc_dev(host->mmc), "Invalid MMC id\n");
                 goto err_irq;