From: Roland Stigge <stigge@antcom.de> To: arm@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kevin.wells@nxp.com, srinivas.bakki@nxp.com, aletes.xgr@gmail.com Cc: Roland Stigge <stigge@antcom.de> Subject: [PATCH 3/8] ARM: LPC32xx: Remove wrong re-initialization of MMC clock register Date: Thu, 28 Jun 2012 00:26:13 +0200 [thread overview] Message-ID: <1340835978-20331-4-git-send-email-stigge@antcom.de> (raw) In-Reply-To: <1340835978-20331-1-git-send-email-stigge@antcom.de> 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: Roland Stigge <stigge@antcom.de> Acked-by: Alexandre Pereira da Silva <aletes.xgr@gmail.com> --- arch/arm/mach-lpc32xx/clock.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) --- linux-2.6.orig/arch/arm/mach-lpc32xx/clock.c +++ linux-2.6/arch/arm/mach-lpc32xx/clock.c @@ -871,7 +871,7 @@ static unsigned long mmc_round_rate(stru 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); prate = clk->parent->get_rate(clk->parent); @@ -879,16 +879,12 @@ static int mmc_set_rate(struct clk *clk, div = prate / crate; /* 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) & ~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(oldclk, LPC32XX_CLKPWR_MS_CTRL); - return 0; }
WARNING: multiple messages have this Message-ID (diff)
From: stigge@antcom.de (Roland Stigge) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/8] ARM: LPC32xx: Remove wrong re-initialization of MMC clock register Date: Thu, 28 Jun 2012 00:26:13 +0200 [thread overview] Message-ID: <1340835978-20331-4-git-send-email-stigge@antcom.de> (raw) In-Reply-To: <1340835978-20331-1-git-send-email-stigge@antcom.de> 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: Roland Stigge <stigge@antcom.de> Acked-by: Alexandre Pereira da Silva <aletes.xgr@gmail.com> --- arch/arm/mach-lpc32xx/clock.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) --- linux-2.6.orig/arch/arm/mach-lpc32xx/clock.c +++ linux-2.6/arch/arm/mach-lpc32xx/clock.c @@ -871,7 +871,7 @@ static unsigned long mmc_round_rate(stru 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); prate = clk->parent->get_rate(clk->parent); @@ -879,16 +879,12 @@ static int mmc_set_rate(struct clk *clk, div = prate / crate; /* 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) & ~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(oldclk, LPC32XX_CLKPWR_MS_CTRL); - return 0; }
next prev parent reply other threads:[~2012-06-27 22:27 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-06-27 22:26 [PATCH 0/8] ARM: LPC32xx specific updates for next, second set Roland Stigge 2012-06-27 22:26 ` Roland Stigge 2012-06-27 22:26 ` [PATCH 1/8] ARM: LPC32xx: Init MMC via clock Roland Stigge 2012-06-27 22:26 ` Roland Stigge 2012-06-27 22:26 ` [PATCH 2/8] ARM: LPC32xx: Add further bits to MMC init Roland Stigge 2012-06-27 22:26 ` Roland Stigge 2012-06-27 22:26 ` Roland Stigge [this message] 2012-06-27 22:26 ` [PATCH 3/8] ARM: LPC32xx: Remove wrong re-initialization of MMC clock register Roland Stigge 2012-06-27 22:26 ` [PATCH 4/8] ARM: LPC32xx: Update DTS file for EA3250 board Roland Stigge 2012-06-27 22:26 ` Roland Stigge 2012-06-27 22:26 ` [PATCH 5/8] ARM: LPC32xx: Defconfig update Roland Stigge 2012-06-27 22:26 ` Roland Stigge 2012-06-27 22:26 ` [PATCH 6/8] ARM: LPC32xx: Cleanup USB clock init Roland Stigge 2012-06-27 22:26 ` Roland Stigge 2012-06-27 22:26 ` [PATCH 7/8] ARM: LPC32xx: Remove USB and I2C init from phy3250.c Roland Stigge 2012-06-27 22:26 ` Roland Stigge 2012-06-27 22:26 ` [PATCH 8/8] ARM: LPC32xx: Remove unused gpios Roland Stigge 2012-06-27 22:26 ` Roland Stigge
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1340835978-20331-4-git-send-email-stigge@antcom.de \ --to=stigge@antcom.de \ --cc=aletes.xgr@gmail.com \ --cc=arm@kernel.org \ --cc=kevin.wells@nxp.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=srinivas.bakki@nxp.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.