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

Pull battery updates from Anton Vorontsov:
 "1. New drivers:
     - Marvell 88pm860x charger and battery drivers;
     - Texas Instruments LP8788 charger driver;
  2. Two new power supply properties: whether a battery is authentic,
     and chargers' maximal currents and voltages;
  3. A lot of TI LP8727 Charger cleanups;
  4. New features for Charger Manager, mainly now we can disable
     specific regulators;
  5. Random fixes and cleanups for other drivers."

Fix up trivial conflicts in <linux/mfd/88pm860x.h>

* tag 'for-v3.7' of git://git.infradead.org/battery-2.6: (52 commits)
  pda_power: Remove ac_draw_failed goto and label
  charger-manager: Add support sysfs entry for charger
  charger-manager: Support limit of maximum possible
  charger-manager: Check fully charged state of battery periodically
  lp8727_charger: More pure cosmetic improvements
  lp8727_charger: Fix checkpatch warning
  lp8727_charger: Add description in the private data
  lp8727_charger: Fix a typo - chg_parm to chg_param
  lp8727_charger: Make some cosmetic changes in lp8727_delayed_func()
  lp8727_charger: Clean up lp8727_charger_changed()
  lp8727_charger: Return if the battery is discharging
  lp8727_charger: Make lp8727_charger_get_propery() simpler
  lp8727_charger: Make lp8727_ctrl_switch() inline
  lp8727_charger: Make lp8727_init_device() shorter
  lp8727_charger: Clean up lp8727_is_charger_attached()
  lp8727_charger: Use specific definition
  lp8727_charger: Clean up lp8727 definitions
  lp8727_charger: Use the definition rather than enum
  lp8727_charger: Fix code for getting battery temp
  lp8727_charger: Clear interrrupts at inital time
  ...

1 files changed, 19 insertions, 1 deletions

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 80978196aae8..49a893972318 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -69,6 +69,12 @@ config TEST_POWER
         help
           This driver is used for testing. It's safe to say M here.
 
+config BATTERY_88PM860X
+        tristate "Marvell 88PM860x battery driver"
+        depends on MFD_88PM860X
+        help
+          Say Y here to enable battery monitor for Marvell 88PM860x chip.
+
 config BATTERY_DS2760
         tristate "DS2760 battery driver (HP iPAQ & others)"
         depends on W1 && W1_SLAVE_DS2760
@@ -174,7 +180,6 @@ config BATTERY_DA9030
 config BATTERY_DA9052
         tristate "Dialog DA9052 Battery"
         depends on PMIC_DA9052
-        depends on BROKEN
         help
           Say Y here to enable support for batteries charger integrated into
           DA9052 PMIC.
@@ -210,6 +215,12 @@ config BATTERY_S3C_ADC
         help
           Say Y here to enable support for iPAQ h1930/h1940/rx1950 battery
 
+config CHARGER_88PM860X
+        tristate "Marvell 88PM860x Charger driver"
+        depends on MFD_88PM860X && BATTERY_88PM860X
+        help
+          Say Y here to enable charger for Marvell 88PM860x chip.
+
 config CHARGER_PCF50633
         tristate "NXP PCF50633 MBC"
         depends on MFD_PCF50633
@@ -262,6 +273,13 @@ config CHARGER_LP8727
         help
           Say Y here to enable support for LP8727 Charger Driver.
 
+config CHARGER_LP8788
+        tristate "TI LP8788 charger driver"
+        depends on MFD_LP8788
+        depends on LP8788_ADC
+        help
+          Say Y to enable support for the LP8788 linear charger.
+
 config CHARGER_GPIO
         tristate "GPIO charger"
         depends on GPIOLIB