summaryrefslogtreecommitdiff
path: root/drivers/regulator/Kconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-24 10:11:40 (GMT)
committerMark Brown <broonie@linaro.org>2013-10-24 10:11:40 (GMT)
commitaa11a358f88b371dee64a556eb7acc9ea05b0102 (patch)
tree439035bd5fd20b04b3a2ac0200afd3f0319d42d2 /drivers/regulator/Kconfig
parent67471b6a242b182dd44afbd3848fcfe4065c6445 (diff)
parent18dca93eb7faa8d90fbc54bfb08560caebbf92cd (diff)
downloadlinux-aa11a358f88b371dee64a556eb7acc9ea05b0102.tar.xz
Merge remote-tracking branch 'regulator/topic/stw481x' into regulator-next
Diffstat (limited to 'drivers/regulator/Kconfig')
-rw-r--r--drivers/regulator/Kconfig8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 75c04b8..ce785f4 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -427,6 +427,14 @@ config REGULATOR_TI_ABB
on TI SoCs may be unstable without enabling this as it provides
device specific optimized bias to allow/optimize functionality.
+config REGULATOR_STW481X_VMMC
+ bool "ST Microelectronics STW481X VMMC regulator"
+ depends on MFD_STW481X
+ default y if MFD_STW481X
+ help
+ This driver supports the internal VMMC regulator in the STw481x
+ PMIC chips.
+
config REGULATOR_TPS51632
tristate "TI TPS51632 Power Regulator"
depends on I2C