Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into...

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

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 63116854b6529b037c75ca7a2d2d7a3962bc0f3f..8aeff33f3f275b400eccf058d75e32082a6f4de8 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -29,12 +29,20 @@ config APM_POWER
          Say Y here to enable support APM status emulation using
          battery class devices.
 
+config MAX8925_POWER
+       tristate "MAX8925 battery charger support"
+       depends on MFD_MAX8925
+       help
+         Say Y here to enable support for the battery charger in the Maxim
+         MAX8925 PMIC.
+
 config WM831X_BACKUP
        tristate "WM831X backup battery charger support"
        depends on MFD_WM831X
        help
          Say Y here to enable support for the backup battery charger
          in the Wolfson Microelectronics WM831x PMICs.
+
 config WM831X_POWER
        tristate "WM831X PMU support"
        depends on MFD_WM831X
@@ -63,6 +71,11 @@ config WM8350_POWER
           Say Y here to enable support for the power management unit
          provided by the Wolfson Microelectronics WM8350 PMIC.
 
+config TEST_POWER
+       tristate "Test power driver"
+       help
+         This driver is used for testing. It's safe to say M here.
+
 config BATTERY_DS2760
        tristate "DS2760 battery driver (HP iPAQ & others)"
        select W1
@@ -70,11 +83,18 @@ config BATTERY_DS2760
        help
          Say Y here to enable support for batteries with ds2760 chip.
 
+config BATTERY_DS2781
+       tristate "DS2781 battery driver"
+       select W1
+       select W1_SLAVE_DS2781
+       help
+         Say Y here to enable support for batteries with ds2781 chip.
+
 config BATTERY_DS2782
-       tristate "DS2782 standalone gas-gauge"
+       tristate "DS2782/DS2786 standalone gas-gauge"
        depends on I2C
        help
-         Say Y here to enable support for the DS2782 standalone battery
+         Say Y here to enable support for the DS2782/DS2786 standalone battery
          gas-gauge.
 
 config BATTERY_PMU
@@ -97,17 +117,29 @@ config BATTERY_TOSA
          Say Y to enable support for the battery on the Sharp Zaurus
          SL-6000 (tosa) models.
 
+config BATTERY_COLLIE
+       tristate "Sharp SL-5500 (collie) battery"
+       depends on SA1100_COLLIE && MCP_UCB1200
+       help
+         Say Y to enable support for the battery on the Sharp Zaurus
+         SL-5500 (collie) models.
+
 config BATTERY_WM97XX
        bool "WM97xx generic battery driver"
        depends on TOUCHSCREEN_WM97XX=y
        help
          Say Y to enable support for battery measured by WM97xx aux port.
 
+config CHARGER_BQ24617
+       tristate "BQ24617 Charger Driver"
+       help
+         Say Y to include support for BQ24617 Main Battery Charger.
+
 config BATTERY_BQ27x00
-       tristate "BQ27200 battery driver"
+       tristate "BQ27x00 battery driver"
        depends on I2C
        help
-         Say Y here to enable support for batteries with BQ27200(I2C) chip.
+         Say Y here to enable support for batteries with BQ27x00 (I2C) chips.
 
 config BATTERY_DA9030
        tristate "DA9030 battery driver"
@@ -124,6 +156,18 @@ config BATTERY_MAX17040
          in handheld and portable equipment. The MAX17040 is configured
          to operate with a single lithium cell
 
+config BATTERY_Z2
+       tristate "Z2 battery driver"
+       depends on I2C && MACH_ZIPIT2
+       help
+         Say Y to include support for the battery on the Zipit Z2.
+
+config BATTERY_S3C_ADC
+       tristate "Battery driver for Samsung ADC based monitoring"
+       depends on S3C_ADC
+       help
+         Say Y here to enable support for iPAQ h1930/h1940/rx1950 battery
+
 config CHARGER_PCF50633
        tristate "NXP PCF50633 MBC"
        depends on MFD_PCF50633
@@ -142,6 +186,7 @@ config BATTERY_BQ27510
        depends on I2C && ARCH_RK29
        help
          Say Y here to enable support for batteries with BQ27510(I2C) chip.
+
 config BATTERY_BQ27541
        tristate "BQ27541 battery driver"
        select I2C_DEV_RK29
@@ -172,4 +217,22 @@ config NO_BATTERY_IC
        help
          Say no BQ27510(I2C) chip in board .
 
+config BATTERY_JZ4740
+       tristate "Ingenic JZ4740 battery"
+       depends on MACH_JZ4740
+       depends on MFD_JZ4740_ADC
+       help
+         Say Y to enable support for the battery on Ingenic JZ4740 based
+         boards.
+
+         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.
+
 endif # POWER_SUPPLY