UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/drivers/power/reset
History
Linus Torvalds 50fa86172b power supply and reset changes for the v3.18 series 
- Initial support for the following chips
   * max77836 (charger)
   * max14577 (charger)
   * bq27742 (battery gauge)
   * ltc2952 (poweroff)
   * stih416 (restart)
   * syscon-reboot (restart)
   * gpio-restart (restart)
  - cleanup of power supply core
  - misc. fixes in power supply and reset drivers
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCgAGBQJUOWD7AAoJENju1/PIO/qaj5QP/AtbG96NRpX6Ou8W+qulhSbe
 npTKItRMERZhV+lJUAdmLxQq8Cy6I5Cobdj140oIM6HIKZ7Dh6jChxd2t+RCLsO0
 Y16VMq45L9E/mQuVCLqSSNCPKrRjbF7hW+8gpym/Yc846o3Fv8nhTQzkWxCsVrDR
 rNerRnrUyvKpqRpCN88u4ZuOHjm/146nZtTsAzvL8nGnQBZFJHv4eu7D5nwSN0QS
 FrLiI/mE7h1KFcdK5LrZf51IfEP9w4RVV3vs1wEuP0iPS5dguv2dNzXXVZa5eD/2
 AYSSouVKkgdwryLAvIIaDLD405UYl5Xgt5J6d+QKXxm2+eeZMEY36+PEK5WtRtBX
 CykzO2BgvxyOdz2HU9D8irR1Li71jVSWwQITMJ6bQsbKEQAhltmkmsTOxtqB+ekd
 254rKcKWTqllmEhg1LR8PCidf8OZNEcKzXi4XmQdQIcKNF9tvdTXP5c0/FzuIAlQ
 tqWZW1kQK6/TTfx+XxeeszJWY5VknIaka2Bi83pOZYtu94CtUFBdEVkpaYmC433+
 qLOto7VMy+AKYViTJJDDEnSEFiLNZz/zF+SUDf+YB1RelULSF3zC8CbDcZQa5fNm
 4qTU1fl2gGrIZ1jDPPihm6xP8r9WkeuQWEytG2UJZoa+l4XmzfLHBUUDVo0zqTd3
 txfmKca8Y3GhXGwINi1m
 =sj9S
 -----END PGP SIGNATURE-----

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

Pull power supply and reset updates from Sebastian Reichel:
 - Initial support for the following chips
   * max77836 (charger)
   * max14577 (charger)
   * bq27742 (battery gauge)
   * ltc2952 (poweroff)
   * stih416 (restart)
   * syscon-reboot (restart)
   * gpio-restart (restart)
 - cleanup of power supply core
 - misc fixes in power supply and reset drivers

* tag 'for-v3.18' of git://git.infradead.org/battery-2.6: (48 commits)
  power: ab8500_fg: Fix build warning
  Documentation: charger: max14577: Update the date of introducing ABI
  power: reset: corrections for simple syscon reboot driver
  Documentation: power: reset: Add documentation for generic SYSCON reboot driver
  power: reset: Add generic SYSCON register mapped reset
  bq27x00_battery: Fix flag reading for bq27742
  power: reset: use restart_notifier mechanism for msm-poweroff
  power: Add simple gpio-restart driver
  power: reset: st: Provide DT bindings for ST's Power Reset driver
  power: reset: Add restart functionality for STiH41x platforms
  power: charger-manager: Fix NULL pointer exception with missing cm-fuel-gauge
  power: max14577: Fix circular config SYSFS dependency
  power: gpio-charger: do not use gpio value directly
  power: max8925: Use of_get_child_by_name
  power: max8925: Fix NULL ptr dereference on memory allocation failure
  bq27x00_battery: Add support to bq27742
  Documentation: charger: max14577: Document exported sysfs entry
  devicetree: mfd: max14577: Add device tree bindings document
  power: max17040: Add ID for MAX77836 Fuel Gauge block
  charger: max14577: Configure battery-dependent settings from DTS and sysfs
  ...

Conflicts:
	drivers/power/reset/Kconfig
	drivers/power/reset/Makefile
 		2014-10-15 06:56:23 +02:00
..
Kconfig power supply and reset changes for the v3.18 series 2014-10-15 06:56:23 +02:00
Makefile power supply and reset changes for the v3.18 series 2014-10-15 06:56:23 +02:00
arm-versatile-reboot.c power: reset: driver for the Versatile syscon reboot 2014-09-26 00:25:59 +02:00
as3722-poweroff.c power: reset: Add as3722 power-off driver 2013-12-23 17:20:37 -08:00
at91-poweroff.c power: reset: at91-poweroff: fix wakeup status register index 2014-09-01 18:40:44 +02:00
at91-reset.c power: reset: Add AT91 reset driver 2014-07-15 13:40:33 +02:00
axxia-reset.c power: reset: Add Axxia system reset driver 2014-05-23 18:18:45 +02:00
brcmstb-reboot.c power: reset: Add reboot driver for brcmstb 2014-07-23 13:49:23 +02:00
gpio-poweroff.c power: poweroff: gpio: convert to use descriptors 2014-07-18 23:40:23 +02:00
gpio-restart.c power: Add simple gpio-restart driver 2014-09-26 19:51:15 +02:00
hisi-reboot.c power: reset: move hisilicon reboot code 2014-07-30 22:32:21 -07:00
keystone-reset.c power: reset: keystone-reset: introduce keystone reset driver 2014-05-27 09:46:40 -04:00
ltc2952-poweroff.c power: reset: add LTC2952 poweroff driver 2014-09-16 11:01:39 +02:00
msm-poweroff.c power: reset: use restart_notifier mechanism for msm-poweroff 2014-09-26 19:54:33 +02:00
qnap-poweroff.c Power: Reset: Generalize qnap-poweroff to work on Synology devices. 2014-03-04 03:48:41 +00:00
restart-poweroff.c power/restart: call machine_restart instead of arm_pm_restart 2014-09-26 00:00:11 -07:00
st-poweroff.c power: reset: Add restart functionality for STiH41x platforms 2014-09-26 17:34:15 +02:00
sun6i-reboot.c power: reset: Add Allwinner A31 reset code 2014-05-23 10:40:34 +02:00
syscon-reboot.c power: reset: corrections for simple syscon reboot driver 2014-10-03 04:32:08 +02:00
vexpress-poweroff.c mfd: vexpress: Convert custom func API to regmap 2014-05-15 17:02:18 +01:00
xgene-reboot.c power/reset: xgene-reset: Fix prototype of xgene_restart() 2014-09-06 20:59:07 +02:00