Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / drivers / power / supply / Kconfig

diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
index 42877ff757b1969dfb01c8fc567dde5e3cbe4001..da54ac88f068977965bec59fce129ecd0de7fc1b 100644 (file)
--- a/drivers/power/supply/Kconfig
+++ b/drivers/power/supply/Kconfig
@@ -220,6 +220,18 @@ config BATTERY_DA9150
          This driver can also be built as a module. If so, the module will be
          called da9150-fg.
 
+config CHARGER_AXP20X
+       tristate "X-Powers AXP20X and AXP22X AC power supply driver"
+       depends on MFD_AXP20X
+       depends on AXP20X_ADC
+       depends on IIO
+       help
+         Say Y here to enable support for X-Powers AXP20X and AXP22X PMICs' AC
+         power supply.
+
+         This driver can also be built as a module. If so, the module will be
+         called axp20x_ac_power.
+
 config AXP288_CHARGER
        tristate "X-Powers AXP288 Charger"
        depends on MFD_AXP20X && EXTCON_AXP288
@@ -298,13 +310,6 @@ config BATTERY_JZ4740
          This driver can be build as a module. If so, the module will be
          called jz4740-battery.
 
-config BATTERY_INTEL_MID
-       tristate "Battery driver for Intel MID platforms"
-       depends on INTEL_SCU_IPC && SPI
-       help
-         Say Y here to enable the battery driver on Intel MID
-         platforms.
-
 config BATTERY_RX51
        tristate "Nokia RX-51 (N900) battery driver"
        depends on TWL4030_MADC
@@ -376,6 +381,16 @@ config CHARGER_MAX14577
          Say Y to enable support for the battery charger control sysfs and
          platform data of MAX14577/77836 MUICs.
 
+config CHARGER_DETECTOR_MAX14656
+       tristate "Maxim MAX14656 USB charger detector"
+       depends on I2C
+       depends on OF
+       help
+         Say Y to enable support for the Maxim MAX14656 USB charger detector.
+         The device is compliant with the USB Battery Charging Specification
+         Revision 1.2 and can be found e.g. in Kindle 4/5th generation
+         readers and certain LG devices.
+
 config CHARGER_MAX77693
        tristate "Maxim MAX77693 battery charger driver"
        depends on MFD_MAX77693
@@ -401,6 +416,7 @@ config CHARGER_QCOM_SMBB
        depends on MFD_SPMI_PMIC || COMPILE_TEST
        depends on OF
        depends on EXTCON
+       depends on REGULATOR
        help
          Say Y to include support for the Switch-Mode Battery Charger and
          Boost (SMBB) hardware found in Qualcomm PM8941 PMICs.  The charger