diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-05-17 21:33:40 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:19 +0200 |
| commit | 9d8adf517dbee958c10f576c4e9932c30b5120ed (patch) | |
| tree | 7ef14c4d55c73c71487f7cecdd5f60ec832b02df /arch/arm/mach-ux500/board-mop500.c | |
| parent | 1bc8f0001593baf85cce96acbfdebf41833458bf (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/mach-ux500/board-mop500.c')
| -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 746a71cf705..d3f08bb9f33 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -25,6 +25,7 @@ #include <linux/mfd/tc3589x.h> #include <linux/mfd/tps6105x.h> #include <linux/mfd/ab8500/gpio.h> +#include <linux/regulator/fixed.h> #include <linux/leds-lp5521.h> #include <linux/input.h> #include <linux/smsc911x.h> @@ -267,6 +268,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 */ @@ -457,6 +470,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, @@ -838,6 +859,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, }; /* |