omap3: HSMMC2 8-bit mux configuration

Add support for omap hsmmc2 8-bit mux configuration.

Signed-off-by: Madhusudhan Chikkature <madhu.cr@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 8d23e1f7f84bcb6d9b955f0838e4e8b5bd520d96..8b6cd8c82dd2da12a76b79c5d0bc1c8cf1b9cb18 100644 (file)
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -609,6 +609,12 @@ static inline void omap2_mmc_mux(struct omap_mmc_platform_data *mmc_controller,
                                omap_cfg_reg(AG4_3430_MMC2_DAT2);
                                omap_cfg_reg(AF4_3430_MMC2_DAT3);
                        }
+                       if (mmc_controller->slots[0].wires == 8) {
+                               omap_cfg_reg(AE4_3430_MMC2_DAT4);
+                               omap_cfg_reg(AH3_3430_MMC2_DAT5);
+                               omap_cfg_reg(AF3_3430_MMC2_DAT6);
+                               omap_cfg_reg(AE3_3430_MMC2_DAT7);
+                       }
                }
 
                /*

diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index 32c953e608db3a9901ef4cd6ed2cc195663e9679..83256d34944454a3f961727271eebdbea29b7723 100644 (file)
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -532,6 +532,14 @@ MUX_CFG_34XX("AG4_3430_MMC2_DAT2", 0x160,
                OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)
 MUX_CFG_34XX("AF4_3430_MMC2_DAT3", 0x162,
                OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)
+MUX_CFG_34XX("AE4_3430_MMC2_DAT4", 0x164,
+               OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)
+MUX_CFG_34XX("AH3_3430_MMC2_DAT5", 0x166,
+               OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)
+MUX_CFG_34XX("AF3_3430_MMC2_DAT6", 0x168,
+               OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)
+MUX_CFG_34XX("AE3_3430_MMC2_DAT7", 0x16A,
+               OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)
 
 /* MMC3 */
 MUX_CFG_34XX("AF10_3430_MMC3_CLK", 0x5d8,

diff --git a/arch/arm/plat-omap/include/plat/mux.h b/arch/arm/plat-omap/include/plat/mux.h
index 56e357e9ec4e78d006b22a1a410bb9e1ffbc390c..f74331d4a9c3d15320fffb92e0ca8c3c9357318d 100644 (file)
--- a/arch/arm/plat-omap/include/plat/mux.h
+++ b/arch/arm/plat-omap/include/plat/mux.h
@@ -834,6 +834,10 @@ enum omap34xx_index {
        AH4_3430_MMC2_DAT1,
        AG4_3430_MMC2_DAT2,
        AF4_3430_MMC2_DAT3,
+       AE4_3430_MMC2_DAT4,
+       AH3_3430_MMC2_DAT5,
+       AF3_3430_MMC2_DAT6,
+       AE3_3430_MMC2_DAT7,
 
        /* MMC3 */
        AF10_3430_MMC3_CLK,