From: Ohad Ben-Cohen <ohad@wizery.com>
To: <linux-wireless@vger.kernel.org>, <linux-mmc@vger.kernel.org>,
<linux-omap@vger.kernel.org>
Cc: Ido Yariv <ido@wizery.com>,
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 v4 7/8] omap: zoom: add fixed regulator device for wlan
Date: Wed, 11 Aug 2010 21:21:52 +0300 [thread overview]
Message-ID: <1281550913-17633-8-git-send-email-ohad@wizery.com> (raw)
In-Reply-To: <1281550913-17633-1-git-send-email-ohad@wizery.com>
Add a fixed regulator vmmc device to enable power control
of the wl1271 wlan device.
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
---
arch/arm/mach-omap2/board-zoom-peripherals.c | 35 ++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c
index 6b39849..de88635 100644
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -16,6 +16,7 @@
#include <linux/gpio.h>
#include <linux/i2c/twl.h>
#include <linux/regulator/machine.h>
+#include <linux/regulator/fixed.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -27,6 +28,8 @@
#include "mux.h"
#include "hsmmc.h"
+#define OMAP_ZOOM_WLAN_PMENA_GPIO (101)
+
/* Zoom2 has Qwerty keyboard*/
static int board_keymap[] = {
KEY(0, 0, KEY_E),
@@ -106,6 +109,11 @@ static struct regulator_consumer_supply zoom_vmmc2_supply = {
.supply = "vmmc",
};
+static struct regulator_consumer_supply zoom_vmmc3_supply = {
+ .supply = "vmmc",
+ .dev_name = "mmci-omap-hs.2",
+};
+
/* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */
static struct regulator_init_data zoom_vmmc1 = {
.constraints = {
@@ -151,6 +159,32 @@ static struct regulator_init_data zoom_vsim = {
.consumer_supplies = &zoom_vsim_supply,
};
+static struct regulator_init_data zoom_vmmc3 = {
+ .constraints = {
+ .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+ },
+ .num_consumer_supplies = 1,
+ .consumer_supplies = &zoom_vmmc3_supply,
+};
+
+static struct fixed_voltage_config zoom_vwlan = {
+ .supply_name = "vwl1271",
+ .microvolts = 1800000, /* 1.8V */
+ .gpio = OMAP_ZOOM_WLAN_PMENA_GPIO,
+ .startup_delay = 70000, /* 70msec */
+ .enable_high = 1,
+ .enabled_at_boot = 0,
+ .init_data = &zoom_vmmc3,
+};
+
+static struct platform_device omap_vwlan_device = {
+ .name = "reg-fixed-voltage",
+ .id = 1,
+ .dev = {
+ .platform_data = &zoom_vwlan,
+ },
+};
+
static struct omap2_hsmmc_info mmc[] __initdata = {
{
.name = "external",
@@ -280,6 +314,7 @@ static void enable_board_wakeup_source(void)
void __init zoom_peripherals_init(void)
{
omap_i2c_init();
+ platform_device_register(&omap_vwlan_device);
usb_musb_init(&musb_board_data);
enable_board_wakeup_source();
}
--
1.7.0.4
next prev parent reply other threads:[~2010-08-11 18:22 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-11 18:21 [PATCH v4 0/8] native support for wl1271 on ZOOM Ohad Ben-Cohen
2010-08-11 18:21 ` [PATCH v4 1/8] wireless: wl1271: make wl12xx.h common to both spi and sdio Ohad Ben-Cohen
2010-08-11 18:21 ` [PATCH v4 2/8] wireless: wl1271: support return value for the set power func Ohad Ben-Cohen
2010-08-11 18:35 ` DebBarma, Tarun Kanti
2010-08-11 22:19 ` Ohad Ben-Cohen
2010-08-11 18:21 ` [PATCH v4 3/8] wireless: wl1271: add platform driver to get board data Ohad Ben-Cohen
2010-08-11 18:42 ` DebBarma, Tarun Kanti
2010-08-11 18:47 ` Felipe Balbi
2010-08-11 18:52 ` DebBarma, Tarun Kanti
2010-08-11 18:57 ` Felipe Balbi
2010-08-11 19:27 ` DebBarma, Tarun Kanti
2010-08-11 21:25 ` Russell King - ARM Linux
2010-08-11 22:15 ` Ohad Ben-Cohen
2010-08-12 6:40 ` Ohad Ben-Cohen
2010-08-12 9:55 ` Russell King - ARM Linux
2010-08-13 0:01 ` Ohad Ben-Cohen
2010-08-16 4:21 ` DebBarma, Tarun Kanti
2010-08-12 5:21 ` Felipe Balbi
2010-08-11 21:21 ` Russell King - ARM Linux
2010-08-11 20:10 ` Ohad Ben-Cohen
2010-08-11 21:34 ` Vitaly Wool
2010-08-11 22:18 ` Ohad Ben-Cohen
2010-08-12 5:27 ` Felipe Balbi
2010-08-11 18:21 ` [PATCH v4 4/8] wireless: wl1271: take irq info from private " Ohad Ben-Cohen
2010-08-11 18:21 ` [PATCH v4 5/8] wireless: wl1271: make ref_clock configurable by board Ohad Ben-Cohen
2010-08-11 18:21 ` [PATCH v4 6/8] omap: hsmmc: remove unused variable Ohad Ben-Cohen
2010-08-11 18:21 ` Ohad Ben-Cohen [this message]
2010-08-11 18:21 ` [PATCH v4 8/8] omap: zoom: add mmc3/wl1271 device support 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=1281550913-17633-8-git-send-email-ohad@wizery.com \
--to=ohad@wizery.com \
--cc=akpm@linux-foundation.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=ido@wizery.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).