summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-lpc32xx
diff options
context:
space:
mode:
authorRoland Stigge <stigge@antcom.de>2012-07-01 21:06:44 +0200
committerRoland Stigge <stigge@antcom.de>2012-07-01 21:06:44 +0200
commitb0d9ef0e2df67685ffc74b1bafa648261ede30c0 (patch)
treea9763fc741dce366b3c14c02db45c4ed1298e0c5 /arch/arm/mach-lpc32xx
parentARM: LPC32xx: Init MMC via clock (diff)
downloadlinux-b0d9ef0e2df67685ffc74b1bafa648261ede30c0.tar.xz
linux-b0d9ef0e2df67685ffc74b1bafa648261ede30c0.zip
ARM: LPC32xx: Add further bits to MMC init
This patch makes sure certain MMC bits are cleared as they should for initialization. Signed-off-by: Roland Stigge <stigge@antcom.de> Acked-by: Alexandre Pereira da Silva <aletes.xgr@gmail.com>
Diffstat (limited to 'arch/arm/mach-lpc32xx')
-rw-r--r--arch/arm/mach-lpc32xx/clock.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-lpc32xx/clock.c b/arch/arm/mach-lpc32xx/clock.c
index 345c28d5615b..eb1b12092951 100644
--- a/arch/arm/mach-lpc32xx/clock.c
+++ b/arch/arm/mach-lpc32xx/clock.c
@@ -813,7 +813,11 @@ static int mmc_onoff_enable(struct clk *clk, int enable)
tmp = __raw_readl(LPC32XX_CLKPWR_MS_CTRL) &
~(LPC32XX_CLKPWR_MSCARD_SDCARD_EN |
- LPC32XX_CLKPWR_MSCARD_MSDIO_PU_EN);
+ LPC32XX_CLKPWR_MSCARD_MSDIO_PU_EN |
+ LPC32XX_CLKPWR_MSCARD_MSDIO_PIN_DIS |
+ LPC32XX_CLKPWR_MSCARD_MSDIO0_DIS |
+ LPC32XX_CLKPWR_MSCARD_MSDIO1_DIS |
+ LPC32XX_CLKPWR_MSCARD_MSDIO23_DIS);
/* If rate is 0, disable clock */
if (enable != 0)