Merge tag 'for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply

Pull power supply and reset updates from Sebastian Reichel:
 - move power supply drivers to drivers/power/supply
 - unify location of power supply DT documentation
 - tps65217-charger: IRQ support
 - act8945a-charger: misc. cleanups & improvements
 - sbs-battery cleanup
 - fix users of deprecated create_singlethread_workqueue()
 - misc fixes.

* tag 'for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (46 commits)
  power: supply: bq27xxx_battery: allow kernel poll_interval parameter runtime update
  power: supply: sbs-battery: Cleanup removal of chip->pdata
  power: reset: st: Remove obsolete platforms from dt doc
  power: reset: st-poweroff: Remove obsolete platforms.
  power: reset: zx-reboot: Unmap region obtained by of_iomap
  power: reset: xgene-reboot: Unmap region obtained by of_iomap
  power: supply: ab8500: cleanup with list_first_entry_or_null()
  power: reset: add in missing white space in error message text
  sbs-battery: make writes to ManufacturerAccess optional
  power: bq24257: Fix use of uninitialized pointer bq->charger
  power: supply: sbs-battery: simplify DT parsing
  power: supply: bq24735-charger: Request status GPIO with initial input setup
  power: supply: sbs-battery: Use gpio_desc and sleeping calls for battery detect
  power: supply: act8945a_charger: Add max current property
  power: supply: act8945a_charger: Add capacity level property
  doc: bindings: power: act8945a-charger: Update properties.
  power: supply: act8945a_charger: Fix the power supply type
  power: supply: act8945a_charger: Add status change update support
  power: supply: act8945a_charger: Improve state handling
  power: supply: act8945a_charger: Remove "battery_temperature"
  ...

1 files changed, 25 insertions, 21 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 464437dbfa26..40f462966564 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3784,8 +3784,8 @@ F:	drivers/leds/leds-da90??.c
 F:      drivers/mfd/da903x.c
 F:      drivers/mfd/da90??-*.c
 F:      drivers/mfd/da91??-*.c
-F:      drivers/power/da9052-battery.c
-F:      drivers/power/da91??-*.c
+F:      drivers/power/supply/da9052-battery.c
+F:      drivers/power/supply/da91??-*.c
 F:      drivers/regulator/da903x.c
 F:      drivers/regulator/da9???-regulator.[ch]
 F:      drivers/rtc/rtc-da90??.c
@@ -7579,8 +7579,8 @@ M:	Krzysztof Kozlowski <krzk@kernel.org>
 M:      Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 L:      linux-pm@vger.kernel.org
 S:      Supported
-F:      drivers/power/max14577_charger.c
-F:      drivers/power/max77693_charger.c
+F:      drivers/power/supply/max14577_charger.c
+F:      drivers/power/supply/max77693_charger.c
 
 MAXIM MAX77802 MULTIFUNCTION PMIC DEVICE DRIVERS
 M:      Javier Martinez Canillas <javier@osg.samsung.com>
@@ -8486,11 +8486,11 @@ R:	Pali Rohár <pali.rohar@gmail.com>
 F:      include/linux/power/bq2415x_charger.h
 F:      include/linux/power/bq27xxx_battery.h
 F:      include/linux/power/isp1704_charger.h
-F:      drivers/power/bq2415x_charger.c
-F:      drivers/power/bq27xxx_battery.c
-F:      drivers/power/bq27xxx_battery_i2c.c
-F:      drivers/power/isp1704_charger.c
-F:      drivers/power/rx51_battery.c
+F:      drivers/power/supply/bq2415x_charger.c
+F:      drivers/power/supply/bq27xxx_battery.c
+F:      drivers/power/supply/bq27xxx_battery_i2c.c
+F:      drivers/power/supply/isp1704_charger.c
+F:      drivers/power/supply/rx51_battery.c
 
 NTB DRIVER CORE
 M:      Jon Mason <jdmason@kudzu.us>
@@ -9490,16 +9490,12 @@ F:	drivers/powercap/
 
 POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
 M:      Sebastian Reichel <sre@kernel.org>
-M:      Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-M:      David Woodhouse <dwmw2@infradead.org>
 L:      linux-pm@vger.kernel.org
-T:      git git://git.infradead.org/battery-2.6.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git
 S:      Maintained
-F:      Documentation/devicetree/bindings/power/
-F:      Documentation/devicetree/bindings/power_supply/
+F:      Documentation/devicetree/bindings/power/supply/
 F:      include/linux/power_supply.h
-F:      drivers/power/
-X:      drivers/power/avs/
+F:      drivers/power/supply/
 
 POWER STATE COORDINATION INTERFACE (PSCI)
 M:      Mark Rutland <mark.rutland@arm.com>
@@ -10514,8 +10510,8 @@ F:	drivers/thunderbolt/
 TI BQ27XXX POWER SUPPLY DRIVER
 R:      Andrew F. Davis <afd@ti.com>
 F:      include/linux/power/bq27xxx_battery.h
-F:      drivers/power/bq27xxx_battery.c
-F:      drivers/power/bq27xxx_battery_i2c.c
+F:      drivers/power/supply/bq27xxx_battery.c
+F:      drivers/power/supply/bq27xxx_battery_i2c.c
 
 TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
 M:      John Stultz <john.stultz@linaro.org>
@@ -11512,6 +11508,14 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
 S:      Supported
 F:      drivers/mfd/syscon.c
 
+SYSTEM RESET/SHUTDOWN DRIVERS
+M:      Sebastian Reichel <sre@kernel.org>
+L:      linux-pm@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git
+S:      Maintained
+F:      Documentation/devicetree/bindings/power/reset/
+F:      drivers/power/reset/
+
 SYSV FILESYSTEM
 M:      Christoph Hellwig <hch@infradead.org>
 S:      Maintained
@@ -11860,7 +11864,7 @@ F:	include/linux/platform_data/lp855x.h
 TI LP8727 CHARGER DRIVER
 M:      Milo Kim <milo.kim@ti.com>
 S:      Maintained
-F:      drivers/power/lp8727_charger.c
+F:      drivers/power/supply/lp8727_charger.c
 F:      include/linux/platform_data/lp8727.h
 
 TI LP8788 MFD DRIVER
@@ -11869,7 +11873,7 @@ S:	Maintained
 F:      drivers/iio/adc/lp8788_adc.c
 F:      drivers/leds/leds-lp8788.c
 F:      drivers/mfd/lp8788*.c
-F:      drivers/power/lp8788-charger.c
+F:      drivers/power/supply/lp8788-charger.c
 F:      drivers/regulator/lp8788-*.c
 F:      include/linux/mfd/lp8788*.h
 
@@ -12946,7 +12950,7 @@ F:	drivers/input/touchscreen/wm97*.c
 F:      drivers/mfd/arizona*
 F:      drivers/mfd/wm*.c
 F:      drivers/mfd/cs47l24*
-F:      drivers/power/wm83*.c
+F:      drivers/power/supply/wm83*.c
 F:      drivers/rtc/rtc-wm83*.c
 F:      drivers/regulator/wm8*.c
 F:      drivers/video/backlight/wm83*_bl.c