* [PATCH v6 6/7] omap: zoom: add fixed regulator device for wlan
@ 2010-09-15 23:32 ` Ohad Ben-Cohen
0 siblings, 0 replies; 8+ messages in thread
From: Ohad Ben-Cohen @ 2010-09-15 23:32 UTC (permalink / raw)
To: linux-wireless-u79uwXL29TY76Z2rM5mHXA,
linux-omap-u79uwXL29TY76Z2rM5mHXA
Cc: John W. Linville, Mark Brown,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
Chikkature Rajashekar Madhusudhan, Luciano Coelho, San Mehat,
Roger Quadros, Tony Lindgren, Nicolas Pitre, Ido Yariv,
Kalle Valo, Russell King, Vitaly Wool, Ohad Ben-Cohen
Add a fixed regulator vmmc device to enable power control
of the wl1271 wlan device.
Signed-off-by: Ohad Ben-Cohen <ohad-Ix1uc/W3ht7QT0dZR+AlfA@public.gmane.org>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v6 6/7] omap: zoom: add fixed regulator device for wlan
@ 2010-09-15 23:32 ` Ohad Ben-Cohen
0 siblings, 0 replies; 8+ messages in thread
From: Ohad Ben-Cohen @ 2010-09-15 23:32 UTC (permalink / raw)
To: linux-wireless, linux-omap
Cc: John W. Linville, Mark Brown, linux-arm-kernel,
Chikkature Rajashekar Madhusudhan, Luciano Coelho, San Mehat,
Roger Quadros, Tony Lindgren, Nicolas Pitre, Ido Yariv,
Kalle Valo, Russell King, Vitaly Wool, Ohad Ben-Cohen
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v6 6/7] omap: zoom: add fixed regulator device for wlan
@ 2010-09-15 23:32 ` Ohad Ben-Cohen
0 siblings, 0 replies; 8+ messages in thread
From: Ohad Ben-Cohen @ 2010-09-15 23:32 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v6 6/7] omap: zoom: add fixed regulator device for wlan
2010-09-15 23:32 ` Ohad Ben-Cohen
@ 2010-09-16 17:44 ` Tony Lindgren
-1 siblings, 0 replies; 8+ messages in thread
From: Tony Lindgren @ 2010-09-16 17:44 UTC (permalink / raw)
To: Ohad Ben-Cohen
Cc: linux-wireless, linux-omap, John W. Linville, Mark Brown,
linux-arm-kernel, Chikkature Rajashekar Madhusudhan,
Luciano Coelho, San Mehat, Roger Quadros, Nicolas Pitre,
Ido Yariv, Kalle Valo, Russell King, Vitaly Wool
* Ohad Ben-Cohen <ohad@wizery.com> [100915 16:23]:
> Add a fixed regulator vmmc device to enable power control
> of the wl1271 wlan device.
<snip>
> +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,
> +};
These are usually aligned with tabs before the = sign.
> +static struct platform_device omap_vwlan_device = {
> + .name = "reg-fixed-voltage",
> + .id = 1,
> + .dev = {
> + .platform_data = &zoom_vwlan,
> + },
> +};
Like in this struct.
After that's fixed, here's my ack for these to go via the
wireless tree:
Acked-by: Tony Lindgren <tony@atomide.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v6 6/7] omap: zoom: add fixed regulator device for wlan
@ 2010-09-16 17:44 ` Tony Lindgren
0 siblings, 0 replies; 8+ messages in thread
From: Tony Lindgren @ 2010-09-16 17:44 UTC (permalink / raw)
To: linux-arm-kernel
* Ohad Ben-Cohen <ohad@wizery.com> [100915 16:23]:
> Add a fixed regulator vmmc device to enable power control
> of the wl1271 wlan device.
<snip>
> +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,
> +};
These are usually aligned with tabs before the = sign.
> +static struct platform_device omap_vwlan_device = {
> + .name = "reg-fixed-voltage",
> + .id = 1,
> + .dev = {
> + .platform_data = &zoom_vwlan,
> + },
> +};
Like in this struct.
After that's fixed, here's my ack for these to go via the
wireless tree:
Acked-by: Tony Lindgren <tony@atomide.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v6 6/7] omap: zoom: add fixed regulator device for wlan
2010-09-16 17:44 ` Tony Lindgren
(?)
@ 2010-09-16 19:47 ` Ohad Ben-Cohen
-1 siblings, 0 replies; 8+ messages in thread
From: Ohad Ben-Cohen @ 2010-09-16 19:47 UTC (permalink / raw)
To: Tony Lindgren
Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA,
linux-omap-u79uwXL29TY76Z2rM5mHXA, John W. Linville, Mark Brown,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
Chikkature Rajashekar Madhusudhan, Luciano Coelho, San Mehat,
Roger Quadros, Nicolas Pitre, Ido Yariv, Kalle Valo, Russell King,
Vitaly Wool
On Thu, Sep 16, 2010 at 7:44 PM, Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> wrote:
> These are usually aligned with tabs before the = sign.
Fixed.
> Acked-by: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
Thanks, Tony.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v6 6/7] omap: zoom: add fixed regulator device for wlan
@ 2010-09-16 19:47 ` Ohad Ben-Cohen
0 siblings, 0 replies; 8+ messages in thread
From: Ohad Ben-Cohen @ 2010-09-16 19:47 UTC (permalink / raw)
To: Tony Lindgren
Cc: linux-wireless, linux-omap, John W. Linville, Mark Brown,
linux-arm-kernel, Chikkature Rajashekar Madhusudhan,
Luciano Coelho, San Mehat, Roger Quadros, Nicolas Pitre,
Ido Yariv, Kalle Valo, Russell King, Vitaly Wool
On Thu, Sep 16, 2010 at 7:44 PM, Tony Lindgren <tony@atomide.com> wrote:
> These are usually aligned with tabs before the = sign.
Fixed.
> Acked-by: Tony Lindgren <tony@atomide.com>
Thanks, Tony.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v6 6/7] omap: zoom: add fixed regulator device for wlan
@ 2010-09-16 19:47 ` Ohad Ben-Cohen
0 siblings, 0 replies; 8+ messages in thread
From: Ohad Ben-Cohen @ 2010-09-16 19:47 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Sep 16, 2010 at 7:44 PM, Tony Lindgren <tony@atomide.com> wrote:
> These are usually aligned with tabs before the = sign.
Fixed.
> Acked-by: Tony Lindgren <tony@atomide.com>
Thanks, Tony.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2010-09-16 19:47 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-15 23:32 [PATCH v6 6/7] omap: zoom: add fixed regulator device for wlan Ohad Ben-Cohen
2010-09-15 23:32 ` Ohad Ben-Cohen
2010-09-15 23:32 ` Ohad Ben-Cohen
2010-09-16 17:44 ` Tony Lindgren
2010-09-16 17:44 ` Tony Lindgren
[not found] ` <20100916174431.GC29610-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2010-09-16 19:47 ` Ohad Ben-Cohen
2010-09-16 19:47 ` Ohad Ben-Cohen
2010-09-16 19:47 ` Ohad Ben-Cohen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.