diff --git a/[refs] b/[refs] index 770543602fbb..f865f41d87f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5df5d01dd04ce0dde58e305dd258c7e54f079e65 +refs/heads/master: b0d9ef0e2df67685ffc74b1bafa648261ede30c0 diff --git a/trunk/arch/arm/mach-lpc32xx/clock.c b/trunk/arch/arm/mach-lpc32xx/clock.c index 345c28d5615b..eb1b12092951 100644 --- a/trunk/arch/arm/mach-lpc32xx/clock.c +++ b/trunk/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)