Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 021723e6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
  ...
parents c6594fc6 1d72706f

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -1090,6 +1090,10 @@ S: 6350 Stoneridge Mall Road 
S: Pleasanton, CA 94588

S: USA



N: Dmitry Eremin-Solenikov

E: dbaryshkov@gmail.com

D: Power Supply Maintainer from v3.14 - v3.15



N: Doug Evans

E: dje@cygnus.com

D: Wrote Xenix FS (part of standard kernel since 0.99.15)

Documentation/ABI/testing/sysfs-class-power

+4 −4
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ Description: 
What:		/sys/class/power_supply/max14577-charger/device/fast_charge_timer

Date:		October 2014

KernelVersion:	3.18.0

Contact:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

Contact:	Krzysztof Kozlowski <krzk@kernel.org>

Description:

		This entry shows and sets the maximum time the max14577

		charger operates in fast-charge mode. When the timer expires
@@ -36,7 +36,7 @@ Description: 
What:		/sys/class/power_supply/max77693-charger/device/fast_charge_timer

Date:		January 2015

KernelVersion:	3.19.0

Contact:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

Contact:	Krzysztof Kozlowski <krzk@kernel.org>

Description:

		This entry shows and sets the maximum time the max77693

		charger operates in fast-charge mode. When the timer expires
@@ -50,7 +50,7 @@ Description: 
What:		/sys/class/power_supply/max77693-charger/device/top_off_threshold_current

Date:		January 2015

KernelVersion:	3.19.0

Contact:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

Contact:	Krzysztof Kozlowski <krzk@kernel.org>

Description:

		This entry shows and sets the charging current threshold for

		entering top-off charging mode. When charging current in fast
@@ -65,7 +65,7 @@ Description: 
What:		/sys/class/power_supply/max77693-charger/device/top_off_timer

Date:		January 2015

KernelVersion:	3.19.0

Contact:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

Contact:	Krzysztof Kozlowski <krzk@kernel.org>

Description:

		This entry shows and sets the maximum time the max77693

		charger operates in top-off charge mode. When the timer expires