omap: zoom: add fixed regulator device for wlan
Subsystems (3)
PATCH v6 6/7 omap: zoom: add fixed regulator device for wlan
Add a fixed regulator vmmc device to enable power control of the wl1271 wlan device.
--- arch/arm/mach-omap2/board-zoom-peripherals.c | 35 ++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/board-zoom-peripherals.c +35 -0
@@ -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 (); }
Signature · 1 line
1.7.0.4
Tony Lindgren
maintainerPATCH v6 6/7 omap: zoom: add fixed regulator device for wlan
Quoted 2 lines · Ohad Ben-Cohen
Add a fixed regulator vmmc device to enable power control of the wl1271 wlan device.
<snip>
arch/arm/mach-omap2/board-zoom-peripherals.c static struct regulator_init_data zoom_vsim = { · line 178
Quoted 9 lines
arch/arm/mach-omap2/board-zoom-peripherals.c +9
-0+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.
arch/arm/mach-omap2/board-zoom-peripherals.c static struct regulator_init_data zoom_vsim = { · line 186
Quoted 7 lines
arch/arm/mach-omap2/board-zoom-peripherals.c +7
-0+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:
PATCH v6 6/7 omap: zoom: add fixed regulator device for wlan
Quoted 1 line · Tony Lindgren
These are usually aligned with tabs before the = sign.
Fixed.
Quoted 1 line
Acked-by Tony Lindgren <[email protected]>
Thanks, Tony.