diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-05-09 13:54:04 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2011-07-22 15:43:14 +0200 |
| commit | 49d17e6a69cc5bb3a1c0078e1af05a2b75eddd86 (patch) | |
| tree | 64a9131eae676d964b0059bd2f8741d567e1e4ee /include | |
| parent | c40031ec274d04f59dbb664739b694ff96a77eb7 (diff) | |
regulator Added regulator for sysclkreq and connected BT and WLAN
ST-Ericsson Linux next: -
ST-Ericsson ID: ER 324615
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I616eda9d8e292c05dd8094d8085f5b488ee90396
Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/19533
Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com>
Reviewed-by: Yvan FILLION <yvan.fillion@stericsson.com>
Tested-by: Yvan FILLION <yvan.fillion@stericsson.com>
Reviewed-by: Henrik CARLING <henrik.carling@stericsson.com>
Conflicts:
arch/arm/mach-ux500/board-mop500-regulators.c
arch/arm/mach-ux500/board-mop500.c
arch/arm/mach-ux500/virt-regulator-u8500.c
drivers/regulator/ab8500.c
include/linux/mfd/ab8500/ab8500-gpio.h
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/ab8500/gpio.h | 7 | ||||
| -rw-r--r-- | include/linux/regulator/ab8500.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/mfd/ab8500/gpio.h b/include/linux/mfd/ab8500/gpio.h index 2b4f1452c74..8ab95be71af 100644 --- a/include/linux/mfd/ab8500/gpio.h +++ b/include/linux/mfd/ab8500/gpio.h @@ -20,5 +20,12 @@ struct ab8500_gpio_platform_data { int ab8500_config_pull_up_or_down(struct device *dev, unsigned ab8500_gpio_offset, bool enable); + +int ab8500_gpio_config_select(struct device *dev, + unsigned ab8500_gpio_offset, bool gpio_select); + +int ab8500_gpio_config_get_select(struct device *dev, + unsigned ab8500_gpio_offset, bool *gpio_select); + #endif /* _AB8500_GPIO_H */ diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h index b753789fabc..29b5e19c4f4 100644 --- a/include/linux/regulator/ab8500.h +++ b/include/linux/regulator/ab8500.h @@ -23,6 +23,8 @@ enum ab8500_regulator_id { AB8500_LDO_ANAMIC2, AB8500_LDO_DMIC, AB8500_LDO_ANA, + AB8500_SYSCLKREQ_2, + AB8500_SYSCLKREQ_4, AB8500_NUM_REGULATORS, }; |