From 361162ae0e4d736a3741b5991722df8ff533f99d Mon Sep 17 00:00:00 2001 From: Madhu Date: Sun, 22 Nov 2009 10:11:08 -0800 Subject: [PATCH] --- yaml --- r: 172799 b: refs/heads/master c: 4679232d3a2085fa5080f260d68b4049c14d5b76 h: refs/heads/master i: 172797: 9f34eb360dcb869b60ef3fc3cd65b7b4169be4e7 172795: a6352761bb8c58b9dc04052dd34b1b9192a16fba 172791: 485e909824cd0b1d7406ba0fc43d952cc88563d3 172783: 82866f8e5eacc26ff8351ffcbc641f8b33c93a52 172767: 5d32800632d325e3c619ada481ca1982f5df19ad 172735: 93974aaae956b481a57aef58198bc35bde4f8a91 172671: 8066e1f06794e0b622e65c79a033ec9233ecdddb 172543: ebc1ce3b888cf69cf3f0a7a3bbee5450cf89610e v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/devices.c | 6 ++++++ trunk/arch/arm/mach-omap2/mux.c | 8 ++++++++ trunk/arch/arm/plat-omap/include/plat/mux.h | 4 ++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f6992ba799dd..250c390a81f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 555d503ff30b3b1292d743bb77b19212b6befb59 +refs/heads/master: 4679232d3a2085fa5080f260d68b4049c14d5b76 diff --git a/trunk/arch/arm/mach-omap2/devices.c b/trunk/arch/arm/mach-omap2/devices.c index 8d23e1f7f84b..8b6cd8c82dd2 100644 --- a/trunk/arch/arm/mach-omap2/devices.c +++ b/trunk/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/trunk/arch/arm/mach-omap2/mux.c b/trunk/arch/arm/mach-omap2/mux.c index 32c953e608db..83256d349444 100644 --- a/trunk/arch/arm/mach-omap2/mux.c +++ b/trunk/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/trunk/arch/arm/plat-omap/include/plat/mux.h b/trunk/arch/arm/plat-omap/include/plat/mux.h index 56e357e9ec4e..f74331d4a9c3 100644 --- a/trunk/arch/arm/plat-omap/include/plat/mux.h +++ b/trunk/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,