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

Commit 3ac684b8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull power supply and reset updates from Sebastian Reichel:

 - Microsemi Ocelot reset support

 - Spreadtrum SC27xx reset support

 - generic gpio charger: lot's of cleanups

 - axp20x fuel gauge: add AXP813 support

 - misc fixes, including one devicetree change for the Nokia N900, that
   has been Acked-by Tony Lindgren

* tag 'for-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (27 commits)
  power: reset: at91-reset: Switch from the pr_*() to the dev_*() logging functions
  power: reset: at91-poweroff: Remove redundant dev_err call in at91_poweroff_probe()
  power: reset: at91-poweroff: Switch from the pr_*() to the dev_*() logging functions
  power: reset: make function sc27xx_poweroff_shutdown static
  power: supply: da9150-fg: remove VLA usage
  ARM: dts: omap3-n900: Add link between battery and charger
  power: supply: bq2415x: add DT referencing support
  power: supply: bq27xxx: support missing supplier device
  max17042: propagate of_node to power supply device
  power: supply: axp288_fuel_gauge: Fix full status reporting
  power: supply: axp288_fuel_gauge: Do not register FG on ECS EF20EA
  power: reset: gpio-poweroff: Support for timeout from device property
  dt-bindings: power: reset: gpio-poweroff: Add 'timeout-ms' property
  power: reset: Add Spreadtrum SC27xx PMIC power off support
  power: supply: axp20x_battery: add support for AXP813
  dt-bindings: power: supply: axp20x: add AXP813 battery DT binding
  power: supply: axp20x_battery: use data struct for variant specific code
  power: supply: gpio-charger: Remove pdata from gpio_charger
  power: supply: gpio-charger: Use GPIOF_ACTIVE_LOW for legacy setup
  power: supply: gpio-charger: Remove redundant dev_err call in probe function
  ...
parents 75dcc7ef fd73a3e6

Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt

+3 −0
Original line number Diff line number Diff line
@@ -27,10 +27,13 @@ Optional properties: 
  it to an output when the power-off handler is called. If this optional

  property is not specified, the GPIO is initialized as an output in its

  inactive state.

- timeout-ms: Time to wait before asserting a WARN_ON(1). If nothing is

              specified, 3000 ms is used.



Examples:



gpio-poweroff {

	compatible = "gpio-poweroff";

	gpios = <&gpio 4 0>;

	timeout-ms = <3000>;

};

Documentation/devicetree/bindings/power/reset/ocelot-reset.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
Microsemi Ocelot reset controller



The DEVCPU_GCB:CHIP_REGS have a SOFT_RST register that can be used to reset the

SoC MIPS core.



Required Properties:

 - compatible: "mscc,ocelot-chip-reset"



Example:

	reset@1070008 {

		compatible = "mscc,ocelot-chip-reset";

		reg = <0x1070008 0x4>;

	};

Documentation/devicetree/bindings/power/supply/axp20x_battery.txt

+4 −4
Original line number Diff line number Diff line
@@ -4,12 +4,12 @@ Required Properties: 
 - compatible, one of:

			"x-powers,axp209-battery-power-supply"

			"x-powers,axp221-battery-power-supply"

			"x-powers,axp813-battery-power-supply"



This node is a subnode of the axp20x/axp22x PMIC.

This node is a subnode of its respective PMIC DT node.



The AXP20X and AXP22X can read the battery voltage, charge and discharge

currents of the battery by reading ADC channels from the AXP20X/AXP22X

ADC.

The supported devices can read the battery voltage, charge and discharge

currents of the battery by reading ADC channels from the ADC.



Example:

arch/arm/boot/dts/omap3-n900.dts

+1 −0
Original line number Diff line number Diff line
@@ -673,6 +673,7 @@ 
	bq27200: bq27200@55 {

		compatible = "ti,bq27200";

		reg = <0x55>;

		power-supplies = <&bq24150a>;

	};



	/* Stereo headphone amplifier */

drivers/power/reset/Kconfig

+16 −0
Original line number Diff line number Diff line
@@ -104,6 +104,13 @@ config POWER_RESET_MSM 
	help

	  Power off and restart support for Qualcomm boards.



config POWER_RESET_OCELOT_RESET

	bool "Microsemi Ocelot reset driver"

	depends on MSCC_OCELOT || COMPILE_TEST

	select MFD_SYSCON

	help

	  This driver supports restart for Microsemi Ocelot SoC.



config POWER_RESET_PIIX4_POWEROFF

	tristate "Intel PIIX4 power-off driver"

	depends on PCI
@@ -218,5 +225,14 @@ config SYSCON_REBOOT_MODE 
	  register, then the bootloader can read it to take different

	  action according to the mode.



config POWER_RESET_SC27XX

	bool "Spreadtrum SC27xx PMIC power-off driver"

	depends on MFD_SC27XX_PMIC || COMPILE_TEST

	help

	  This driver supports powering off a system through

	  Spreadtrum SC27xx series PMICs. The SC27xx series

	  PMICs includes the SC2720, SC2721, SC2723, SC2730

	  and SC2731 chips.



endif