aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBengt Jonsson <bengt.g.jonsson@stericsson.com>2011-03-30 14:11:27 +0200
committerHenrik CARLING <henrik.carling@stericsson.com>2011-03-30 20:58:53 +0200
commit984cc7fd240a26262e1608c066eeeb2a4ece8dde (patch)
treebe60b5f472ddaeed8c640998bce1dbce6de5c056 /include
parent22d5089814fb52bbb9bdcf106685cf2d9374e86e (diff)
regulator Added regulator for sysclkreq and connected BT and WLANu8500-android-2.3_v0.48
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>
Diffstat (limited to 'include')
-rw-r--r--include/linux/mfd/ab8500/ab8500-gpio.h7
-rw-r--r--include/linux/regulator/ab8500.h2
2 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/mfd/ab8500/ab8500-gpio.h b/include/linux/mfd/ab8500/ab8500-gpio.h
index 472de6a2ee2..abb407cd57f 100644
--- a/include/linux/mfd/ab8500/ab8500-gpio.h
+++ b/include/linux/mfd/ab8500/ab8500-gpio.h
@@ -20,4 +20,11 @@ struct ab8500_gpio_platform_data {
int ab8500_config_pull_up_or_down(struct device *dev,
unsigned gpio, bool enable);
+
+int ab8500_gpio_config_select(struct device *dev,
+ unsigned gpio, bool gpio_select);
+
+int ab8500_gpio_config_get_select(struct device *dev,
+ unsigned gpio, bool *gpio_select);
+
#endif /* _AB8500_GPIO_H */
diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h
index 81573443588..cfc307d73ff 100644
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -22,6 +22,8 @@ enum ab8500_regulator_id {
AB8500_LDO_ANAMIC2,
AB8500_LDO_DMIC,
AB8500_LDO_ANA,
+ AB8500_SYSCLKREQ_2,
+ AB8500_SYSCLKREQ_4,
AB8500_NUM_REGULATORS,
};