diff options
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500.c')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 5094993bebd..c4edd860395 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -461,11 +461,10 @@ static struct ske_keypad_platform_data mop500_ske_keypad_data = { #endif - +#ifdef CONFIG_REGULATOR_FIXED_VOLTAGE /* * GPIO-regulator wlan vbat data */ - static struct fixed_voltage_config snowball_gpio_wlan_vbat_data = { .supply_name = "WLAN-VBAT", .gpio = SNOWBALL_EN_3V6_GPIO, @@ -476,6 +475,20 @@ static struct fixed_voltage_config snowball_gpio_wlan_vbat_data = { }; /* + * GPIO-regulator en 3v3 vbat data + */ + +static struct fixed_voltage_config snowball_gpio_en_3v3_data = { + .supply_name = "EN-3V3", + .gpio = SNOWBALL_EN_3V3_ETH_GPIO, + .microvolts = 3300000, + .enable_high = 1, + .init_data = &gpio_en_3v3_regulator, + .startup_delay = 5000, /* 1200us according to data sheet */ +}; +#endif + +/* * TC35892 */ @@ -662,6 +675,7 @@ static struct platform_device mop500_gpio_keys_device = { }, }; +#ifdef CONFIG_REGULATOR_FIXED_VOLTAGE static struct platform_device snowball_gpio_wlan_vbat_regulator_device = { .name = "reg-fixed-voltage", .id = 0, @@ -670,6 +684,15 @@ static struct platform_device snowball_gpio_wlan_vbat_regulator_device = { }, }; +static struct platform_device snowball_gpio_en_3v3_regulator_device = { + .name = "reg-fixed-voltage", + .id = 1, + .dev = { + .platform_data = &snowball_gpio_en_3v3_data, + }, +}; +#endif + static int mop500_sensors1p_activate(struct device *dev) { sensors1p_regulator = regulator_get(&mop500_gpio_keys_device.dev, @@ -1145,8 +1168,13 @@ static struct platform_device *snowball_platform_devs[] __initdata = { &ux500_hwmem_device, &snowball_led_dev, &snowball_key_dev, - &snowball_sbnet_dev, +#ifdef CONFIG_REGULATOR_FIXED_VOLTAGE + &snowball_gpio_en_3v3_regulator_device, +#endif +#ifdef CONFIG_REGULATOR_FIXED_VOLTAGE &snowball_gpio_wlan_vbat_regulator_device, +#endif + &snowball_sbnet_dev, &u8500_mcde_device, &u8500_b2r2_device, }; |