From: Tony Lindgren <tony@atomide.com>
To: linux-arm-kernel@lists.infradead.org
Cc: "Stanley.Miao" <stanley.miao@windriver.com>, linux-omap@vger.kernel.org
Subject: [PATCH 03/10] omap: init the gpio pinmux for mmc
Date: Fri, 14 May 2010 14:27:54 -0700 [thread overview]
Message-ID: <20100514212754.25599.5024.stgit@baageli.muru.com> (raw)
In-Reply-To: <20100514212506.25599.98073.stgit@baageli.muru.com>
From: stanley.miao <stanley.miao@windriver.com>
There is two gpio for mmc use, one is for card detecting, another is
used for checking write protect. Intialize its pinmux in case the bootloader
doesn't set it.
Signed-off-by: Stanley.Miao <stanley.miao@windriver.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/devices.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 10f3a3c..3d30f22 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -591,6 +591,15 @@ static inline void omap_hsmmc_reset(void) {}
static inline void omap2_mmc_mux(struct omap_mmc_platform_data *mmc_controller,
int controller_nr)
{
+ if ((mmc_controller->slots[0].switch_pin > 0) && \
+ (mmc_controller->slots[0].switch_pin < OMAP_MAX_GPIO_LINES))
+ omap_mux_init_gpio(mmc_controller->slots[0].switch_pin,
+ OMAP_PIN_INPUT_PULLUP);
+ if ((mmc_controller->slots[0].gpio_wp > 0) && \
+ (mmc_controller->slots[0].gpio_wp < OMAP_MAX_GPIO_LINES))
+ omap_mux_init_gpio(mmc_controller->slots[0].gpio_wp,
+ OMAP_PIN_INPUT_PULLUP);
+
if (cpu_is_omap2420() && controller_nr == 0) {
omap_cfg_reg(H18_24XX_MMC_CMD);
omap_cfg_reg(H15_24XX_MMC_CLKI);
next prev parent reply other threads:[~2010-05-14 21:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-14 21:27 [PATCH 00/10] omap platform init patches for 2.6.35 merge window Tony Lindgren
2010-05-14 21:27 ` [PATCH 01/10] OMAP2/3/4: DMA: disable channel interrupts in omap_init_dma() Tony Lindgren
2010-05-14 21:27 ` [PATCH 02/10] omap: DMA: Fix multi-line comments Tony Lindgren
2010-05-14 21:27 ` Tony Lindgren [this message]
2010-05-14 21:27 ` [PATCH 04/10] omap: hsmmc: fix the hsmmc driver for am3517 Tony Lindgren
2010-05-14 21:28 ` [PATCH 05/10] OMAP4: SPI: Fix Driver Kconfig Tony Lindgren
2010-05-14 21:28 ` [PATCH 06/10] OMAP4: Ethernet: KS8851 Board Support Tony Lindgren
2010-05-14 21:28 ` [PATCH 07/10] OMAP4: Networking: Defconfig Support Tony Lindgren
2010-05-14 21:28 ` [PATCH 08/10] omap4: Move SOC specific code from board file Tony Lindgren
2010-05-14 21:28 ` [PATCH 09/10] omap: GPIO: Fix OMAP4 GPIO reg access issues Tony Lindgren
2010-05-14 21:28 ` [PATCH 10/10] AM3517: rename the i2c boardinfo to make it more readable Tony Lindgren
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=20100514212754.25599.5024.stgit@baageli.muru.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=stanley.miao@windriver.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: 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).