From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Oct 2014 04:56:23 +0000 (+0200)
Subject: Merge tag 'for-v3.18' of git://git.infradead.org/battery-2.6
X-Git-Tag: v5.15~17036
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=50fa86172bec2769979b5eb0cd1a244391ae4bb0;p=platform%2Fkernel%2Flinux-starfive.git

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
---

50fa86172bec2769979b5eb0cd1a244391ae4bb0
diff --cc drivers/power/reset/Kconfig
index 527a0f4,3b451e1..f65ff49
--- a/drivers/power/reset/Kconfig
+++ b/drivers/power/reset/Kconfig
@@@ -40,7 -22,7 +40,7 @@@ config POWER_RESET_AXXI
  
  config POWER_RESET_BRCMSTB
  	bool "Broadcom STB reset driver" if COMPILE_TEST
--	depends on POWER_RESET && ARM
++	depends on ARM
  	default ARCH_BRCMSTB
  	help
  	  This driver provides restart support for ARM-based Broadcom STB
@@@ -57,9 -39,17 +57,17 @@@ config POWER_RESET_GPI
  	  If your board needs a GPIO high/low to power down, say Y and
  	  create a binding in your devicetree.
  
+ config POWER_RESET_GPIO_RESTART
+ 	bool "GPIO restart driver"
 -	depends on OF_GPIO && POWER_RESET
++	depends on OF_GPIO
+ 	help
+ 	  This driver supports restarting your board via a GPIO line.
+ 	  If your board needs a GPIO high/low to restart, say Y and
+ 	  create a binding in your devicetree.
+ 
  config POWER_RESET_HISI
  	bool "Hisilicon power-off driver"
--	depends on POWER_RESET && ARCH_HISI
++	depends on ARCH_HISI
  	help
  	  Reboot support for Hisilicon boards.
  
@@@ -69,9 -59,16 +77,16 @@@ config POWER_RESET_MS
  	help
  	  Power off and restart support for Qualcomm boards.
  
+ config POWER_RESET_LTC2952
+ 	bool "LTC2952 PowerPath power-off driver"
 -	depends on OF_GPIO && POWER_RESET
++	depends on OF_GPIO
+ 	help
+ 	  This driver supports an external powerdown trigger and board power
+ 	  down via the LTC2952. Bindings are made in the device tree.
+ 
  config POWER_RESET_QNAP
  	bool "QNAP power-off driver"
 -	depends on OF_GPIO && POWER_RESET && PLAT_ORION
 +	depends on OF_GPIO && PLAT_ORION
  	help
  	  This driver supports turning off QNAP NAS devices by sending
  	  commands to the microcontroller which controls the main power.
@@@ -92,15 -89,13 +107,21 @@@ config POWER_RESET_SUN6
  	help
  	  Reboot support for the Allwinner A31 SoCs.
  
+ config POWER_RESET_ST
+ 	bool "ST restart power-off driver"
 -	depends on POWER_RESET && ARCH_STI
++	depends on ARCH_STI
+ 	help
+ 	  Power off and reset support for STMicroelectronics boards.
+ 
 +config POWER_RESET_VERSATILE
 +	bool "ARM Versatile family reboot driver"
 +	depends on ARM
 +	depends on MFD_SYSCON
 +	depends on OF
 +	help
 +	  Power off and restart support for ARM Versatile family of
 +	  reference boards.
 +
  config POWER_RESET_VEXPRESS
  	bool "ARM Versatile Express power-off and reset driver"
  	depends on ARM || ARM64
@@@ -122,4 -118,9 +143,12 @@@ config POWER_RESET_KEYSTON
  	help
  	  Reboot support for the KEYSTONE SoCs.
  
+ config POWER_RESET_SYSCON
+ 	bool "Generic SYSCON regmap reset driver"
 -	depends on POWER_RESET && OF
++	depends on OF
+ 	select MFD_SYSCON
+ 	help
+ 	  Reboot support for generic SYSCON mapped register reset.
++
 +endif
++
diff --cc drivers/power/reset/Makefile
index 7322100,61ead27..76ce1c5
--- a/drivers/power/reset/Makefile
+++ b/drivers/power/reset/Makefile
@@@ -9,7 -9,7 +11,8 @@@ obj-$(CONFIG_POWER_RESET_LTC2952) += lt
  obj-$(CONFIG_POWER_RESET_QNAP) += qnap-poweroff.o
  obj-$(CONFIG_POWER_RESET_RESTART) += restart-poweroff.o
  obj-$(CONFIG_POWER_RESET_SUN6I) += sun6i-reboot.o
+ obj-$(CONFIG_POWER_RESET_ST) += st-poweroff.o
 +obj-$(CONFIG_POWER_RESET_VERSATILE) += arm-versatile-reboot.o
  obj-$(CONFIG_POWER_RESET_VEXPRESS) += vexpress-poweroff.o
  obj-$(CONFIG_POWER_RESET_XGENE) += xgene-reboot.o
  obj-$(CONFIG_POWER_RESET_KEYSTONE) += keystone-reset.o