linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/13] omap: zoom3: wlan board muxing
Date: Wed, 07 Jul 2010 12:44:04 +0300	[thread overview]
Message-ID: <20100707094404.2562.29882.stgit@baageli.muru.com> (raw)
In-Reply-To: <20100707094308.2562.91921.stgit@baageli.muru.com>

From: Ohad Ben-Cohen <ohadb@ti.com>

Add board muxing to support the wlan wl1271 chip that is
hardwired to mmc2 (third mmc controller) on the ZOOM3.

Signed-off-by: Ohad Ben-Cohen <ohadb@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/board-zoom3.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-zoom3.c b/arch/arm/mach-omap2/board-zoom3.c
index 3314704..0b62663 100644
--- a/arch/arm/mach-omap2/board-zoom3.c
+++ b/arch/arm/mach-omap2/board-zoom3.c
@@ -46,6 +46,21 @@ static void __init omap_zoom_init_irq(void)
 
 #ifdef CONFIG_OMAP_MUX
 static struct omap_board_mux board_mux[] __initdata = {
+#ifdef CONFIG_OMAP_ZOOM_WLAN
+	/* WLAN IRQ - GPIO 162 */
+	OMAP3_MUX(MCBSP1_CLKX, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP),
+	/* WLAN POWER ENABLE - GPIO 101 */
+	OMAP3_MUX(CAM_D2, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
+	/* WLAN SDIO: MMC3 CMD */
+	OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE3 | OMAP_PIN_INPUT_PULLUP),
+	/* WLAN SDIO: MMC3 CLK */
+	OMAP3_MUX(ETK_CLK, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),
+	/* WLAN SDIO: MMC3 DAT[0-3] */
+	OMAP3_MUX(ETK_D3, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),
+	OMAP3_MUX(ETK_D4, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),
+	OMAP3_MUX(ETK_D5, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),
+	OMAP3_MUX(ETK_D6, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),
+#endif
 	{ .reg_offset = OMAP_MUX_TERMINATOR },
 };
 #else

  parent reply	other threads:[~2010-07-07  9:44 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-07  9:43 [PATCH 00/13] omap2/3/4 board updates for 2.6.36 merge window Tony Lindgren
2010-07-07  9:43 ` [PATCH 01/13] omap: zoom2: wlan board muxing Tony Lindgren
2010-07-07  9:44 ` Tony Lindgren [this message]
2010-07-07  9:44 ` [PATCH 03/13] omap3: pandora: update gpio-keys data Tony Lindgren
2010-07-07  9:44 ` [PATCH 04/13] omap3: pandora: add NAND and wifi support Tony Lindgren
2010-07-07  9:44 ` [PATCH 05/13] omap: rx51: Set regulator V28 always on Tony Lindgren
2010-07-07  9:44 ` [PATCH 06/13] omap: rx51: Add platform_data for tlv320aic3x with reset gpionumber Tony Lindgren
2010-07-07  9:44 ` [PATCH 07/13] omap: rx51: Use REGULATOR_SUPPLY macro when initializingregulator consumers Tony Lindgren
2010-07-07  9:44 ` [PATCH 08/13] omap: rx51: Add supply and data for the tpa6130a2 headphoneamplifier Tony Lindgren
2010-07-07  9:44 ` [PATCH 09/13] tsl2563 ALS support for Nokia N900 Tony Lindgren
2010-07-08 13:01   ` Ameya Palande
2010-07-09  8:35     ` Tony Lindgren
2010-07-07  9:44 ` [PATCH 10/13] omap4: mmc: Fix the regulator resource for MMC2 on 4430sdp Tony Lindgren
2010-07-07  9:44 ` [PATCH 11/13] omap4: Board changes for 4430sdp tmp105 temperature sensor Tony Lindgren
2010-07-07  9:44 ` [PATCH 12/13] OMAP4: Add GPIO LED support for SDP board Tony Lindgren
2010-07-07  9:44 ` [PATCH 13/13] Add OMAP4 Panda Support 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=20100707094404.2562.29882.stgit@baageli.muru.com \
    --to=tony@atomide.com \
    --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).