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

Commit df132e40 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull power supply and reset updates from Sebastian Reichel:

 - Add Spreadtrum SC2731 charger driver

 - bq25890-charger: Add BQ25896 support

 - bq27xxx-battery: Add support for BQ27411

 - qcom-pon: Add pms405 pon support

 - cros-charger: add support for dedicated port

 - misc fixes

* tag 'for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (28 commits)
  power: max8925: mark expected switch fall-through
  power: supply: fix spelling mistake "Gauage" -> "Gauge"
  power: reset: qcom-pon: Add pms405 pon support
  power: supply: bq27xxx: Add support for BQ27411
  power: supply: Add Spreadtrum SC2731 charger support
  dt-bindings: power: Add Spreadtrum SC2731 charger documentation
  power: supply: twl4030_charger: disable eoc interrupt on linear charge
  power: supply: twl4030_charger: fix charging current out-of-bounds
  power: supply: bq25890_charger: fix semicolon.cocci warnings
  power: supply: max8998-charger: Fix platform data retrieval
  power: supply: cros: add support for dedicated port
  mfd: cros: add charger port count command definition
  power: reset: at91-poweroff: do not procede if at91_shdwc is allocated
  power: reset: at91-poweroff: rename at91_shdwc_base member of struct shdwc
  power: reset: at91-poweroff: make sclk part of struct shdwc
  power: reset: at91-poweroff: make mpddrc_base part of struct shdwc
  power: reset: at91-poweroff: use only one poweroff function
  power: reset: at91-poweroff: switch to slow clock before shutdown
  power: reset: convert to SPDX identifiers
  power: supply: ab8500_fg: silence uninitialized variable warnings
  ...
parents 96f2f66a cfb34797

Documentation/devicetree/bindings/power/reset/qcom,pon.txt

+4 −1
Original line number Diff line number Diff line
@@ -6,7 +6,10 @@ and resin along with the Android reboot-mode. 
This DT node has pwrkey and resin as sub nodes.



Required Properties:

-compatible: "qcom,pm8916-pon"

-compatible: Must be one of:

	"qcom,pm8916-pon"

	"qcom,pms405-pon"



-reg: Specifies the physical address of the pon register



Optional subnode:

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

+3 −0
Original line number Diff line number Diff line 
Binding for TI bq25890 Li-Ion Charger



This driver will support the bq25896 and the bq25890. There are other ICs

in the same family but those have not been tested.



Required properties:

- compatible: Should contain one of the following:

    * "ti,bq25890"

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

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ Required properties: 
 * "ti,bq27546" - BQ27546

 * "ti,bq27742" - BQ27742

 * "ti,bq27545" - BQ27545

 * "ti,bq27411" - BQ27411

 * "ti,bq27421" - BQ27421

 * "ti,bq27425" - BQ27425

 * "ti,bq27426" - BQ27426

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

0 → 100644
+40 −0
Original line number Diff line number Diff line 
Spreadtrum SC2731 PMIC battery charger binding



Required properties:

 - compatible: Should be "sprd,sc2731-charger".

 - reg: Address offset of charger register.

 - phys: Contains a phandle to the USB phy.



Optional Properties:

- monitored-battery: phandle of battery characteristics devicetree node.

  The charger uses the following battery properties:

- charge-term-current-microamp: current for charge termination phase.

- constant-charge-voltage-max-microvolt: maximum constant input voltage.

  See Documentation/devicetree/bindings/power/supply/battery.txt



Example:



	bat: battery {

		compatible = "simple-battery";

		charge-term-current-microamp = <120000>;

		constant-charge-voltage-max-microvolt = <4350000>;

		......

	};



	sc2731_pmic: pmic@0 {

		compatible = "sprd,sc2731";

		reg = <0>;

		spi-max-frequency = <26000000>;

		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-controller;

		#interrupt-cells = <2>;

		#address-cells = <1>;

		#size-cells = <0>;



		charger@0 {

			compatible = "sprd,sc2731-charger";

			reg = <0x0>;

			phys = <&ssphy>;

			monitored-battery = <&bat>;

		};

	};

arch/arm/mach-at91/pm_suspend.S

+8 −0
Original line number Diff line number Diff line
@@ -149,6 +149,14 @@ exit_suspend: 
ENDPROC(at91_pm_suspend_in_sram)



ENTRY(at91_backup_mode)

	/* Switch the master clock source to slow clock. */

	ldr	pmc, .pmc_base

	ldr	tmp1, [pmc, #AT91_PMC_MCKR]

	bic	tmp1, tmp1, #AT91_PMC_CSS

	str	tmp1, [pmc, #AT91_PMC_MCKR]



	wait_mckrdy



	/*BUMEN*/

	ldr	r0, .sfr

	mov	tmp1, #0x1