Merge tag 'for-v3.4-rc1' of git://git.infradead.org/battery-2.6

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

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 459f66437fe93159bb696efad3cb3e093eea6dfa..99dc29f2f2f2ba84b16430a51548817b094b9c3a 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -249,7 +249,7 @@ config CHARGER_TWL4030
          Say Y here to enable support for TWL4030 Battery Charge Interface.
 
 config CHARGER_LP8727
-       tristate "National Semiconductor LP8727 charger driver"
+       tristate "TI/National Semiconductor LP8727 charger driver"
        depends on I2C
        help
          Say Y here to enable support for LP8727 Charger Driver.
@@ -288,4 +288,23 @@ config CHARGER_MAX8998
          Say Y to enable support for the battery charger control sysfs and
          platform data of MAX8998/LP3974 PMICs.
 
+config CHARGER_SMB347
+       tristate "Summit Microelectronics SMB347 Battery Charger"
+       depends on I2C
+       help
+         Say Y to include support for Summit Microelectronics SMB347
+         Battery Charger.
+
+config AB8500_BM
+       bool "AB8500 Battery Management Driver"
+       depends on AB8500_CORE && AB8500_GPADC
+       help
+         Say Y to include support for AB5500 battery management.
+
+config AB8500_BATTERY_THERM_ON_BATCTRL
+       bool "Thermistor connected on BATCTRL ADC"
+       depends on AB8500_BM
+       help
+         Say Y to enable battery temperature measurements using
+         thermistor connected on BATCTRL ADC.
 endif # POWER_SUPPLY