From: ohad@wizery.com (Ohad Ben-Cohen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 7/7] omap: zoom: add mmc3/wl1271 device support
Date: Thu, 2 Sep 2010 00:26:50 +0300 [thread overview]
Message-ID: <1283376410-9999-8-git-send-email-ohad@wizery.com> (raw)
In-Reply-To: <1283376410-9999-1-git-send-email-ohad@wizery.com>
Add MMC3 support on ZOOM, which is hardwired to the wl1271 device.
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 | 19 +++++++++++++++++++
1 files changed, 19 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..7ee5663 100644
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -17,6 +17,7 @@
#include <linux/i2c/twl.h>
#include <linux/regulator/machine.h>
#include <linux/regulator/fixed.h>
+#include <linux/wl12xx.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -29,6 +30,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 +187,12 @@ static struct platform_device omap_vwlan_device = {
},
};
+struct wl12xx_platform_data omap_zoom_wlan_data = {
+ .irq = OMAP_GPIO_IRQ(OMAP_ZOOM_WLAN_IRQ_GPIO),
+ /* ZOOM ref clock is 26 MHz */
+ .board_ref_clock = 1,
+};
+
static struct omap2_hsmmc_info mmc[] __initdata = {
{
.name = "external",
@@ -202,6 +210,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,
+ .nonremovable = true,
+ },
{} /* Terminator */
};
@@ -313,6 +329,9 @@ static void enable_board_wakeup_source(void)
void __init zoom_peripherals_init(void)
{
+ if (wl12xx_set_platform_data(&omap_zoom_wlan_data))
+ pr_err("error setting wl12xx data\n");
+
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-09-01 21:26 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-01 21:26 [PATCH v5 0/7] native wl1271 support on ZOOM Ohad Ben-Cohen
2010-09-01 21:26 ` [PATCH v5 1/7] wireless: wl1271: make wl12xx.h common to both spi and sdio Ohad Ben-Cohen
2010-09-01 21:26 ` [PATCH v5 2/7] wireless: wl1271: support return value for the set power func Ohad Ben-Cohen
2010-09-01 21:26 ` [PATCH v5 3/7] wireless: wl12xx: add platform data passing support Ohad Ben-Cohen
2010-09-04 12:23 ` Michał Mirosław
2010-09-06 11:55 ` Ohad Ben-Cohen
2010-09-06 12:07 ` Russell King - ARM Linux
2010-09-06 13:46 ` Ohad Ben-Cohen
2010-09-06 19:42 ` Michał Mirosław
2010-09-15 8:00 ` Ohad Ben-Cohen
2010-09-15 8:27 ` Vitaly Wool
2010-09-15 16:39 ` Tony Lindgren
2010-09-15 8:25 ` Russell King - ARM Linux
2010-09-15 16:10 ` Michał Mirosław
2010-09-01 21:26 ` [PATCH v5 4/7] wireless: wl1271: take irq info from private board data Ohad Ben-Cohen
2010-09-01 21:26 ` [PATCH v5 5/7] wireless: wl1271: make ref_clock configurable by board Ohad Ben-Cohen
2010-09-01 21:26 ` [PATCH v5 6/7] omap: zoom: add fixed regulator device for wlan Ohad Ben-Cohen
2010-09-01 21:26 ` Ohad Ben-Cohen [this message]
2010-09-15 9:21 ` [PATCH v5 0/7] native wl1271 support on ZOOM Ohad Ben-Cohen
2010-09-15 11:08 ` Vitaly Wool
2010-09-15 13:21 ` John W. Linville
2010-09-15 16:34 ` Tony Lindgren
2010-09-15 16:46 ` Ohad Ben-Cohen
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=1283376410-9999-8-git-send-email-ohad@wizery.com \
--to=ohad@wizery.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).