From: stigge@antcom.de (Roland Stigge)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/7] ARM: LPC32xx: Init MMC via clock
Date: Sun, 24 Jun 2012 15:47:11 +0200 [thread overview]
Message-ID: <1340545637-5449-2-git-send-email-stigge@antcom.de> (raw)
In-Reply-To: <1340545637-5449-1-git-send-email-stigge@antcom.de>
This patch moves MMC/SD controller initialization from the board specific file
phy3250.c to clock.c.
Signed-off-by: Roland Stigge <stigge@antcom.de>
Acked-by: Alexandre Pereira da Silva <aletes.xgr@gmail.com>
---
arch/arm/mach-lpc32xx/clock.c | 6 ++++--
arch/arm/mach-lpc32xx/phy3250.c | 5 -----
2 files changed, 4 insertions(+), 7 deletions(-)
--- linux-2.6.orig/arch/arm/mach-lpc32xx/clock.c
+++ linux-2.6/arch/arm/mach-lpc32xx/clock.c
@@ -812,11 +812,13 @@ static int mmc_onoff_enable(struct clk *
u32 tmp;
tmp = __raw_readl(LPC32XX_CLKPWR_MS_CTRL) &
- ~LPC32XX_CLKPWR_MSCARD_SDCARD_EN;
+ ~(LPC32XX_CLKPWR_MSCARD_SDCARD_EN |
+ LPC32XX_CLKPWR_MSCARD_MSDIO_PU_EN);
/* If rate is 0, disable clock */
if (enable != 0)
- tmp |= LPC32XX_CLKPWR_MSCARD_SDCARD_EN;
+ tmp |= LPC32XX_CLKPWR_MSCARD_SDCARD_EN |
+ LPC32XX_CLKPWR_MSCARD_MSDIO_PU_EN;
__raw_writel(tmp, LPC32XX_CLKPWR_MS_CTRL);
--- linux-2.6.orig/arch/arm/mach-lpc32xx/phy3250.c
+++ linux-2.6/arch/arm/mach-lpc32xx/phy3250.c
@@ -262,11 +262,6 @@ static void __init lpc3250_machine_init(
lpc32xx_serial_init();
- tmp = __raw_readl(LPC32XX_CLKPWR_MS_CTRL);
- tmp |= LPC32XX_CLKPWR_MSCARD_SDCARD_EN |
- LPC32XX_CLKPWR_MSCARD_MSDIO_PU_EN;
- __raw_writel(tmp, LPC32XX_CLKPWR_MS_CTRL);
-
/* Test clock needed for UDA1380 initial init */
__raw_writel(LPC32XX_CLKPWR_TESTCLK2_SEL_MOSC |
LPC32XX_CLKPWR_TESTCLK_TESTCLK2_EN,
next prev parent reply other threads:[~2012-06-24 13:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-24 13:47 [PATCH 0/7] ARM: LPC32xx specific updates for next, second set Roland Stigge
2012-06-24 13:47 ` Roland Stigge [this message]
2012-06-24 13:47 ` [PATCH 2/7] ARM: LPC32xx: Add further bits to MMC init Roland Stigge
2012-06-24 13:47 ` [PATCH 3/7] ARM: LPC32xx: Remove wrong re-initialization of MMC clock register Roland Stigge
2012-06-24 13:47 ` [PATCH 4/7] ARM: LPC32xx: Update DTS file for EA3250 board Roland Stigge
2012-06-24 14:03 ` Alexandre Pereira da Silva
2012-06-24 13:47 ` [PATCH 5/7] ARM: LPC32xx: Defconfig update Roland Stigge
2012-06-24 14:05 ` Alexandre Pereira da Silva
2012-06-24 13:47 ` [PATCH 6/7] ARM: LPC32xx: Cleanup USB clock init Roland Stigge
2012-06-24 13:47 ` [PATCH 7/7] ARM: LPC32xx: Remove USB and I2C init from phy3250.c 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=1340545637-5449-2-git-send-email-stigge@antcom.de \
--to=stigge@antcom.de \
--cc=linux-arm-kernel@lists.infradead.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).