From: Ohad Ben-Cohen <ohad@wizery.com>
To: <linux-wireless@vger.kernel.org>, <linux-mmc@vger.kernel.org>,
<linux-omap@vger.kernel.org>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>,
<linux-arm-kernel@lists.infradead.org>,
Chikkature Rajashekar Madhusudhan <madhu.cr@ti.com>,
Luciano Coelho <luciano.coelho@nokia.com>,
<akpm@linux-foundation.org>, San Mehat <san@google.com>,
Roger Quadros <roger.quadros@nokia.com>,
Tony Lindgren <tony@atomide.com>,
Nicolas Pitre <nico@fluxnic.net>,
Pandita Vikram <vikram.pandita@ti.com>,
Kalle Valo <kalle.valo@iki.fi>, Ohad Ben-Cohen <ohad@wizery.com>
Subject: [PATCH v3 9/9] omap: zoom: add mmc3/wl1271 device support
Date: Wed, 11 Aug 2010 01:12:28 +0300 [thread overview]
Message-ID: <1281478348-24833-10-git-send-email-ohad@wizery.com> (raw)
In-Reply-To: <1281478348-24833-1-git-send-email-ohad@wizery.com>
Add MMC3 support on ZOOM, which has the wl1271 device hardwired to.
The wl1271 is a 4-wire, 1.8V, embedded SDIO WLAN device with an
external IRQ line, and power-controlled by a GPIO-based fixed regulator.
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
---
arch/arm/mach-omap2/board-zoom-peripherals.c | 34 ++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c
index de88635..82776bc 100644
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -17,6 +17,8 @@
#include <linux/i2c/twl.h>
#include <linux/regulator/machine.h>
#include <linux/regulator/fixed.h>
+#include <linux/mmc/host.h>
+#include <linux/wl12xx.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -29,6 +31,7 @@
#include "hsmmc.h"
#define OMAP_ZOOM_WLAN_PMENA_GPIO (101)
+#define OMAP_ZOOM_WLAN_IRQ_GPIO (162)
/* Zoom2 has Qwerty keyboard*/
static int board_keymap[] = {
@@ -185,6 +188,28 @@ static struct platform_device omap_vwlan_device = {
},
};
+struct wl12xx_platform_data omap_zoom_wlan_data = {
+ /* ZOOM ref clock is 26 MHz */
+ .board_ref_clock = 1,
+};
+
+static struct resource omap_zoom_wl1271_resources[] = {
+ {
+ .start = OMAP_GPIO_IRQ(OMAP_ZOOM_WLAN_IRQ_GPIO),
+ .end = OMAP_GPIO_IRQ(OMAP_ZOOM_WLAN_IRQ_GPIO),
+ .flags = IORESOURCE_IRQ,
+ }
+};
+static struct platform_device omap_zoom_wl1271 = {
+ .name = "wl1271_plat.2",
+ .id = -1,
+ .resource = omap_zoom_wl1271_resources,
+ .num_resources = ARRAY_SIZE(omap_zoom_wl1271_resources),
+ .dev = {
+ .platform_data = &omap_zoom_wlan_data,
+ },
+};
+
static struct omap2_hsmmc_info mmc[] __initdata = {
{
.name = "external",
@@ -202,6 +227,14 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
.nonremovable = true,
.power_saving = true,
},
+ {
+ .name = "wl1271",
+ .mmc = 3,
+ .wires = 4,
+ .gpio_wp = -EINVAL,
+ .gpio_cd = -EINVAL,
+ .ocr_mask = MMC_VDD_165_195,
+ },
{} /* Terminator */
};
@@ -313,6 +346,7 @@ static void enable_board_wakeup_source(void)
void __init zoom_peripherals_init(void)
{
+ platform_device_register(&omap_zoom_wl1271);
omap_i2c_init();
platform_device_register(&omap_vwlan_device);
usb_musb_init(&musb_board_data);
--
1.7.0.4
next prev parent reply other threads:[~2010-08-10 22:13 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-10 22:12 [PATCH v3 0/9] native support for wl1271 on ZOOM Ohad Ben-Cohen
2010-08-10 22:12 ` [PATCH v3 1/9] wireless: wl1271: make wl12xx.h common to both spi and sdio Ohad Ben-Cohen
2010-08-10 22:12 ` [PATCH v3 2/9] wireless: wl1271: support return value for the set power func Ohad Ben-Cohen
2010-08-10 22:12 ` [PATCH v3 3/9] wireless: wl1271: add platform driver to get board data Ohad Ben-Cohen
2010-08-10 22:12 ` [PATCH v3 4/9] wireless: wl1271: take irq info from private " Ohad Ben-Cohen
2010-08-10 22:12 ` [PATCH v3 5/9] wireless: wl1271: make ref_clock configurable by board Ohad Ben-Cohen
2010-08-10 22:12 ` [PATCH v3 6/9] omap: hsmmc: remove unused variable Ohad Ben-Cohen
2010-08-11 9:55 ` Adrian Hunter
2010-08-11 10:08 ` Ohad Ben-Cohen
2010-08-11 10:28 ` Adrian Hunter
2010-08-10 22:12 ` [PATCH v3 7/9] omap: zoom: add fixed regulator device for wlan Ohad Ben-Cohen
2010-08-10 22:12 ` [PATCH v3 8/9] omap: hsmmc: split mmc23 power control Ohad Ben-Cohen
2010-08-11 8:30 ` Roger Quadros
2010-08-11 10:05 ` Adrian Hunter
2010-08-11 10:52 ` Roger Quadros
2010-08-11 11:01 ` Ohad Ben-Cohen
2010-08-11 16:01 ` Ohad Ben-Cohen
2010-08-10 22:12 ` Ohad Ben-Cohen [this message]
2010-08-11 8:37 ` [PATCH v3 9/9] omap: zoom: add mmc3/wl1271 device support Roger Quadros
2010-08-11 9:01 ` Roger Quadros
2010-08-11 15:38 ` Ohad Ben-Cohen
2010-08-11 15:38 ` Ohad Ben-Cohen
2010-08-11 20:09 ` kishore kadiyala
2010-08-11 20:12 ` Ohad Ben-Cohen
2010-08-11 20:18 ` kishore kadiyala
2010-08-11 21:03 ` Mark Brown
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=1281478348-24833-10-git-send-email-ohad@wizery.com \
--to=ohad@wizery.com \
--cc=akpm@linux-foundation.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=kalle.valo@iki.fi \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=luciano.coelho@nokia.com \
--cc=madhu.cr@ti.com \
--cc=nico@fluxnic.net \
--cc=roger.quadros@nokia.com \
--cc=san@google.com \
--cc=tony@atomide.com \
--cc=vikram.pandita@ti.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).