Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0a30b6a authored by Roland Stigge's avatar Roland Stigge
Browse files

ARM: LPC32xx: Remove wrong re-initialization of MMC clock register 



This patch fixes a bug, (wrongfully) resetting the value of
LPC32XX_CLKPWR_MS_CTRL back to its initial contents (after careful setup). This
was discovered only with a board/bootloader combination (EA3250) where the
contents of the respective register wasn't already at the correct value on
Linux boot.

Signed-off-by: default avatarRoland Stigge <stigge@antcom.de>
Acked-by: default avatarAlexandre Pereira da Silva <aletes.xgr@gmail.com>
parent b0d9ef0e

arch/arm/mach-lpc32xx/clock.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -871,7 +871,7 @@ static unsigned long mmc_round_rate(struct clk *clk, unsigned long rate) 




static int mmc_set_rate(struct clk *clk, unsigned long rate)

static int mmc_set_rate(struct clk *clk, unsigned long rate)

{

{

	u32 oldclk, tmp;

	u32 tmp;

	unsigned long prate, div, crate = mmc_round_rate(clk, rate);

	unsigned long prate, div, crate = mmc_round_rate(clk, rate);





	prate = clk->parent->get_rate(clk->parent);

	prate = clk->parent->get_rate(clk->parent);
@@ -879,16 +879,12 @@ static int mmc_set_rate(struct clk *clk, unsigned long rate) 
	div = prate / crate;

	div = prate / crate;





	/* The MMC clock must be on when accessing an MMC register */

	/* The MMC clock must be on when accessing an MMC register */

	oldclk = __raw_readl(LPC32XX_CLKPWR_MS_CTRL);

	__raw_writel(oldclk | LPC32XX_CLKPWR_MSCARD_SDCARD_EN,

		LPC32XX_CLKPWR_MS_CTRL);

	tmp = __raw_readl(LPC32XX_CLKPWR_MS_CTRL) &

	tmp = __raw_readl(LPC32XX_CLKPWR_MS_CTRL) &

		~LPC32XX_CLKPWR_MSCARD_SDCARD_DIV(0xf);

		~LPC32XX_CLKPWR_MSCARD_SDCARD_DIV(0xf);

	tmp |= LPC32XX_CLKPWR_MSCARD_SDCARD_DIV(div);

	tmp |= LPC32XX_CLKPWR_MSCARD_SDCARD_DIV(div) |

		LPC32XX_CLKPWR_MSCARD_SDCARD_EN;

	__raw_writel(tmp, LPC32XX_CLKPWR_MS_CTRL);

	__raw_writel(tmp, LPC32XX_CLKPWR_MS_CTRL);





	__raw_writel(oldclk, LPC32XX_CLKPWR_MS_CTRL);



	return 0;

	return 0;

}

}