Merge remote-tracking branch 'regulator/topic/stw481x' into regulator-next

[firefly-linux-kernel-4.4.55.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 75c04b8b3ec229ee444b1d0b5315d277da2990fd..ce785f481281d2532dca6514e07a304ccfcb7b04 100644 (file)
--- 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