diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-10-13 16:29:31 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:01:55 +0200 |
| commit | 5fc23b5cf069f02cf4ff8a70492469d2370f0e87 (patch) | |
| tree | 235187042174d36db53cc8426b754bcf3232e540 /arch/arm | |
| parent | 18f9738edbc826058533d40a8f33817d0e8829d4 (diff) | |
mach-ux500: reg: Add snowball wlan regulator
Add snowball wlan regulator to regulators
and add the device to snowball.
ST-Ericsson Linux next: 340134
ST-Ericsson ID: 340139
ST-Ericsson FOSS-OUT ID: Trivial
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Change-Id: I80aef0e8d005822bbd7c23f226155b5404292d5a
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24085
Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 46a5d032de3..da4a8b5e87d 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -24,6 +24,7 @@ #include <linux/mfd/tc3589x.h> #include <linux/mfd/tps6105x.h> #include <linux/mfd/abx500/ab8500-gpio.h> +#include <linux/regulator/fixed.h> #include <linux/leds-lp5521.h> #include <linux/input.h> #include <linux/smsc911x.h> @@ -250,6 +251,18 @@ static struct tps6105x_platform_data mop500_tps61052_data = { }; /* + * GPIO-regulator wlan vbat data + */ + +static struct fixed_voltage_config snowball_gpio_wlan_vbat_data = { + .supply_name = "WLAN-VBAT", + .gpio = SNOWBALL_EN_3V6_GPIO, + .microvolts = 3600000, + .enable_high = 1, + .init_data = &gpio_wlan_vbat_regulator, +}; + +/* * TC35892 */ @@ -441,6 +454,14 @@ static struct platform_device mop500_gpio_keys_device = { }, }; +static struct platform_device snowball_gpio_wlan_vbat_regulator_device = { + .name = "reg-fixed-voltage", + .id = 0, + .dev = { + .platform_data = &snowball_gpio_wlan_vbat_data, + }, +}; + static int mop500_sensors1p_activate(struct device *dev) { sensors1p_regulator = regulator_get(&mop500_gpio_keys_device.dev, @@ -759,6 +780,10 @@ static struct platform_device *snowball_platform_devs[] __initdata = { &snowball_key_dev, &snowball_sbnet_dev, &ab8500_device, + &snowball_gpio_wlan_vbat_regulator_device, + &ux500_hwmem_device, + &u8500_mcde_device, + &u8500_b2r2_device, }; /* |