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

5a69e9bc · Linus Torvalds <[email protected]> · 2021-04-28 15:43:58 -07:00

Pull power supply and reset updates from Sebastian Reichel:
 "battery/charger driver changes:
   - core:
      - provide function stubs if CONFIG_POWER_SUPPLY=n
      - reduce loglevel for probe defer info
   - surface:
      - new battery and charger drivers for Surface
   - bq27xxx:
      - add bq78z100 support
      - fix current_now/power_avg for newer chips
   - cw2015:
      - add CHARGE_NOW support
   - ab8500:
      - drop pdata support
   - convert most DT bindings to YAML
   - lots of minor fixes and cleanups

  reset drivers:
   - ltc2952-poweroff:
      - make trigger delay configurable from DT
   - minor fixes and cleanups"

* tag 'for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (97 commits)
  power: supply: cpcap-battery: fix invalid usage of list cursor
  power: supply: bq256xx: add kerneldoc for structure members
  power: supply: act8945a: correct kerneldoc
  power: supply: max17040: remove unneeded double cast
  power: supply: max17040: handle device_property_read_u8_array() failure
  power: supply: max14577: remove unneeded variable initialization
  power: supply: surface-charger: Make symbol 'surface_ac_pm_ops' static
  power: supply: surface-battery: Make some symbols static
  power: reset: restart-poweroff: Add missing MODULE_DEVICE_TABLE
  power: reset: hisi-reboot: add missing MODULE_DEVICE_TABLE
  power: supply: s3c_adc_battery: fix possible use-after-free in s3c_adc_bat_remove()
  power: supply: generic-adc-battery: fix possible use-after-free in gab_remove()
  power: supply: Add AC driver for Surface Aggregator Module
  power: supply: Add battery driver for Surface Aggregator Module
  power: supply: bq25980: Move props from battery node
  power: supply: core: Use true and false for bool variable
  power: supply: goldfish: Remove the GOLDFISH dependency
  power: reset: ltc2952: make trigger delay configurable
  power: supply: cpcap-charger: Simplify bool conversion
  power: supply: cpcap-charger: Add usleep to cpcap charger to avoid usb plug bounce
  ...

Commit: 5a69e9bce9984806029926f405b4517878e703e2
Parents: a8b5e037 · d0a43c12

Merge commit. Changes below are compared with the first parent: a8b5e037.

Changes

139 files changed · +4680 −2133

File	Status	Add	Del	Content
Documentation/ABI/testing/sysfs-class-power-surface	added	+15	−0	View file
Documentation/devicetree/bindings/power/reset/ltc2952-poweroff.txt	modified	+4	−0	View file
Documentation/devicetree/bindings/power/supply/ab8500/btemp.txt	deleted	+0	−16	View before deletion
Documentation/devicetree/bindings/power/supply/ab8500/chargalg.txt	deleted	+0	−16	View before deletion
Documentation/devicetree/bindings/power/supply/ab8500/charger.txt	deleted	+0	−25	View before deletion
Documentation/devicetree/bindings/power/supply/act8945a-charger.txt	deleted	+0	−44	View before deletion
Documentation/devicetree/bindings/power/supply/active-semi,act8945a-charger.yaml	added	+76	−0	View file
Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt	deleted	+0	−25	View before deletion
Documentation/devicetree/bindings/power/supply/axp20x_battery.txt	deleted	+0	−20	View before deletion
Documentation/devicetree/bindings/power/supply/axp20x_usb_power.txt	deleted	+0	−41	View before deletion
Documentation/devicetree/bindings/power/supply/battery.txt	deleted	+0	−3	View before deletion
Documentation/devicetree/bindings/power/supply/bq2415x.txt	deleted	+0	−47	View before deletion
Documentation/devicetree/bindings/power/supply/bq2415x.yaml	added	+98	−0	View file
Documentation/devicetree/bindings/power/supply/bq24190.txt	deleted	+0	−61	View before deletion
Documentation/devicetree/bindings/power/supply/bq24190.yaml	added	+92	−0	View file
Documentation/devicetree/bindings/power/supply/bq24257.txt	deleted	+0	−62	View before deletion
Documentation/devicetree/bindings/power/supply/bq24257.yaml	added	+124	−0	View file
Documentation/devicetree/bindings/power/supply/bq24735.yaml	added	+89	−0	View file
Documentation/devicetree/bindings/power/supply/bq25890.txt	deleted	+0	−60	View before deletion
Documentation/devicetree/bindings/power/supply/bq25890.yaml	added	+123	−0	View file
Documentation/devicetree/bindings/power/supply/bq27xxx.yaml	modified	+2	−1	View file
Documentation/devicetree/bindings/power/supply/cpcap-battery.txt	deleted	+0	−31	View before deletion
Documentation/devicetree/bindings/power/supply/cpcap-battery.yaml	added	+87	−0	View file
Documentation/devicetree/bindings/power/supply/cpcap-charger.txt	deleted	+0	−40	View before deletion
Documentation/devicetree/bindings/power/supply/cpcap-charger.yaml	added	+106	−0	View file
Documentation/devicetree/bindings/power/supply/da9150-charger.txt	deleted	+0	−26	View before deletion
Documentation/devicetree/bindings/power/supply/da9150-fg.txt	deleted	+0	−23	View before deletion
Documentation/devicetree/bindings/power/supply/dlg,da9150-charger.yaml	added	+52	−0	View file
Documentation/devicetree/bindings/power/supply/dlg,da9150-fuel-gauge.yaml	added	+51	−0	View file
Documentation/devicetree/bindings/power/supply/isp1704.txt	deleted	+0	−17	View before deletion
Documentation/devicetree/bindings/power/supply/isp1704.yaml	added	+42	−0	View file
Documentation/devicetree/bindings/power/supply/lego,ev3-battery.yaml	added	+55	−0	View file
Documentation/devicetree/bindings/power/supply/lego_ev3_battery.txt	deleted	+0	−21	View before deletion
Documentation/devicetree/bindings/power/supply/lltc,lt3651-charger.yaml	added	+44	−0	View file
Documentation/devicetree/bindings/power/supply/lltc,ltc294x.yaml	added	+66	−0	View file
Documentation/devicetree/bindings/power/supply/lp8727_charger.txt	deleted	+0	−43	View before deletion
Documentation/devicetree/bindings/power/supply/lt3651-charger.txt	deleted	+0	−29	View before deletion
Documentation/devicetree/bindings/power/supply/ltc2941.txt	deleted	+0	−28	View before deletion
Documentation/devicetree/bindings/power/supply/max17040_battery.txt	deleted	+0	−52	View before deletion
Documentation/devicetree/bindings/power/supply/max17042_battery.txt	deleted	+0	−35	View before deletion
Documentation/devicetree/bindings/power/supply/max8903-charger.txt	deleted	+0	−24	View before deletion
Documentation/devicetree/bindings/power/supply/maxim,ds2760.txt	deleted	+0	−26	View before deletion
Documentation/devicetree/bindings/power/supply/maxim,ds2760.yaml	added	+43	−0	View file
Documentation/devicetree/bindings/power/supply/maxim,max14656.txt	deleted	+0	−23	View before deletion
Documentation/devicetree/bindings/power/supply/maxim,max14656.yaml	added	+45	−0	View file
Documentation/devicetree/bindings/power/supply/maxim,max17040.yaml	added	+95	−0	View file
Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml	added	+78	−0	View file
Documentation/devicetree/bindings/power/supply/maxim,max8903.yaml	added	+67	−0	View file
Documentation/devicetree/bindings/power/supply/microchip,ucs1002.txt	deleted	+0	−27	View before deletion
Documentation/devicetree/bindings/power/supply/microchip,ucs1002.yaml	added	+51	−0	View file
Documentation/devicetree/bindings/power/supply/nokia,n900-battery.yaml	added	+49	−0	View file
Documentation/devicetree/bindings/power/supply/olpc-battery.yaml	added	+27	−0	View file
Documentation/devicetree/bindings/power/supply/olpc_battery.txt	deleted	+0	−5	View before deletion
Documentation/devicetree/bindings/power/supply/power_supply.txt	deleted	+0	−2	View before deletion
Documentation/devicetree/bindings/power/supply/qcom,coincell-charger.txt	deleted	+0	−48	View before deletion
Documentation/devicetree/bindings/power/supply/qcom,pm8941-charger.yaml	added	+169	−0	View file
Documentation/devicetree/bindings/power/supply/qcom,pm8941-coincell.yaml	added	+57	−0	View file
Documentation/devicetree/bindings/power/supply/qcom_smbb.txt	deleted	+0	−150	View before deletion
Documentation/devicetree/bindings/power/supply/richtek,rt9455.yaml	added	+90	−0	View file
Documentation/devicetree/bindings/power/supply/rohm,bd99954.yaml	modified	+1	−1	View file
Documentation/devicetree/bindings/power/supply/rt9455_charger.txt	deleted	+0	−46	View before deletion
Documentation/devicetree/bindings/power/supply/rx51-battery.txt	deleted	+0	−25	View before deletion
Documentation/devicetree/bindings/power/supply/sbs,sbs-battery.yaml	modified	+5	−2	View file
Documentation/devicetree/bindings/power/supply/sbs,sbs-charger.yaml	added	+55	−0	View file
Documentation/devicetree/bindings/power/supply/sbs,sbs-manager.txt	deleted	+0	−66	View before deletion
Documentation/devicetree/bindings/power/supply/sbs,sbs-manager.yaml	added	+107	−0	View file
Documentation/devicetree/bindings/power/supply/sbs_sbs-charger.txt	deleted	+0	−21	View before deletion
Documentation/devicetree/bindings/power/supply/sc2731-charger.yaml	added	+53	−0	View file
Documentation/devicetree/bindings/power/supply/sc2731_charger.txt	deleted	+0	−40	View before deletion
Documentation/devicetree/bindings/power/supply/sc27xx-fg.txt	deleted	+0	−59	View before deletion
Documentation/devicetree/bindings/power/supply/sc27xx-fg.yaml	added	+98	−0	View file
Documentation/devicetree/bindings/power/supply/ab8500/fg.txt → Documentation/devicetree/bindings/power/supply/stericsson,ab8500-battery.txt	renamed	+4	−28	View file
Documentation/devicetree/bindings/power/supply/stericsson,ab8500-btemp.yaml	added	+73	−0	View file
Documentation/devicetree/bindings/power/supply/stericsson,ab8500-chargalg.yaml	added	+37	−0	View file
Documentation/devicetree/bindings/power/supply/stericsson,ab8500-charger.yaml	added	+123	−0	View file
Documentation/devicetree/bindings/power/supply/stericsson,ab8500-fg.yaml	added	+72	−0	View file
Documentation/devicetree/bindings/power/supply/ti,bq24735.txt	deleted	+0	−39	View before deletion
Documentation/devicetree/bindings/power/supply/ti,lp8727.yaml	added	+90	−0	View file
Documentation/devicetree/bindings/power/supply/tps65090-charger.yaml	added	+36	−0	View file
Documentation/devicetree/bindings/power/supply/tps65090.txt	deleted	+0	−17	View before deletion
Documentation/devicetree/bindings/power/supply/tps65217-charger.yaml	added	+43	−0	View file
Documentation/devicetree/bindings/power/supply/tps65217_charger.txt	deleted	+0	−17	View before deletion
Documentation/devicetree/bindings/power/supply/twl-charger.txt	deleted	+0	−30	View before deletion
Documentation/devicetree/bindings/power/supply/twl4030-charger.yaml	added	+68	−0	View file
Documentation/devicetree/bindings/power/supply/x-powers,axp20x-ac-power-supply.yaml	added	+32	−0	View file
Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml	added	+30	−0	View file
Documentation/devicetree/bindings/power/supply/x-powers,axp20x-usb-power-supply.yaml	added	+33	−0	View file
Documentation/power/power_supply_class.rst	modified	+1	−1	View file
MAINTAINERS	modified	+16	−1	View file
drivers/mfd/ab8500-core.c	modified	+8	−9	View file
drivers/power/reset/Makefile	modified	+1	−1	View file
drivers/power/reset/at91-reset.c	modified	+2	−2	View file
drivers/power/reset/hisi-reboot.c	modified	+3	−2	View file
drivers/power/reset/ltc2952-poweroff.c	modified	+8	−0	View file
drivers/power/reset/restart-poweroff.c	modified	+1	−0	View file
drivers/power/reset/vexpress-poweroff.c	modified	+1	−1	View file
drivers/power/supply/88pm860x_battery.c	modified	+2	−2	View file
drivers/power/supply/Kconfig	modified	+36	−4	View file
drivers/power/supply/Makefile	modified	+2	−0	View file
include/linux/mfd/abx500/ab8500-bm.h → drivers/power/supply/ab8500-bm.h	renamed	+277	−20	View file
include/linux/mfd/abx500/ux500_chargalg.h → drivers/power/supply/ab8500-chargalg.h	renamed	+3	−3	View file
drivers/power/supply/ab8500_bmdata.c	modified	+2	−1	View file
drivers/power/supply/ab8500_btemp.c	modified	+8	−37	View file
drivers/power/supply/ab8500_charger.c	modified	+10	−17	View file
drivers/power/supply/ab8500_fg.c	modified	+7	−13	View file
drivers/power/supply/abx500_chargalg.c	modified	+8	−14	View file
drivers/power/supply/act8945a_charger.c	modified	+1	−1	View file
drivers/power/supply/axp20x_usb_power.c	modified	+3	−1	View file
drivers/power/supply/bq256xx_charger.c	modified	+2	−0	View file
drivers/power/supply/bq25980_charger.c	modified	+12	−28	View file
drivers/power/supply/bq27xxx_battery.c	modified	+107	−62	View file
drivers/power/supply/bq27xxx_battery_i2c.c	modified	+2	−0	View file
drivers/power/supply/charger-manager.c	modified	+1	−1	View file
drivers/power/supply/cpcap-battery.c	modified	+1	−1	View file
drivers/power/supply/cpcap-charger.c	modified	+5	−2	View file
drivers/power/supply/cw2015_battery.c	modified	+6	−0	View file
drivers/power/supply/ds2781_battery.c	modified	+4	−4	View file
drivers/power/supply/generic-adc-battery.c	modified	+1	−1	View file
drivers/power/supply/lp8788-charger.c	modified	+1	−1	View file
drivers/power/supply/max14577_charger.c	modified	+1	−1	View file
drivers/power/supply/max17040_battery.c	modified	+5	−7	View file
drivers/power/supply/max17042_battery.c	modified	+4	−4	View file
drivers/power/supply/max1721x_battery.c	modified	+7	−7	View file
drivers/power/supply/max8997_charger.c	modified	+9	−5	View file
drivers/power/supply/pm2301_charger.c	modified	+3	−3	View file
drivers/power/supply/power_supply_core.c	modified	+2	−2	View file
drivers/power/supply/s3c_adc_battery.c	modified	+6	−15	View file
drivers/power/supply/sbs-battery.c	modified	+9	−19	View file
drivers/power/supply/sbs-charger.c	modified	+8	−16	View file
drivers/power/supply/sbs-manager.c	modified	+28	−50	View file
drivers/power/supply/smb347-charger.c	modified	+39	−26	View file
drivers/power/supply/surface_battery.c	added	+865	−0	View file
drivers/power/supply/surface_charger.c	added	+282	−0	View file
drivers/power/supply/tps65090-charger.c	modified	+1	−1	View file
drivers/power/supply/tps65217_charger.c	modified	+1	−1	View file
drivers/power/supply/z2_battery.c	modified	+0	−3	View file
include/linux/mfd/abx500.h	modified	+0	−276	View file
include/linux/power/bq27xxx_battery.h	modified	+1	−1	View file
include/linux/power_supply.h	modified	+10	−4	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/ABI/testing/sysfs-class-power-surface

View file

diff --git a/Documentation/ABI/testing/sysfs-class-power-surface b/Documentation/ABI/testing/sysfs-class-power-surface
new file mode 100644
index 0000000..79cde4d
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-class-power-surface
@@ -0,0 +1,15 @@
+What:		/sys/class/power_supply/<supply_name>/alarm
+Date:		April 2021
+KernelVersion:	5.13
+Contact:	Maximilian Luz <[email protected]>
+Description:
+		Battery trip point. When the remaining battery capacity crosses this
+		value in either direction, the system will be notified and if
+		necessary woken.
+
+		Set to zero to clear/disable.
+
+		Access: Read, Write
+
+		Valid values: In micro-Wh or micro-Ah, depending on the power unit
+		of the battery

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

View file

diff --git a/Documentation/devicetree/bindings/power/reset/ltc2952-poweroff.txt b/Documentation/devicetree/bindings/power/reset/ltc2952-poweroff.txt
index cd2d7f5..38e54b3 100644
--- a/Documentation/devicetree/bindings/power/reset/ltc2952-poweroff.txt
+++ b/Documentation/devicetree/bindings/power/reset/ltc2952-poweroff.txt
@@ -17,6 +17,9 @@ Optional properties:
 			chip's trigger line. If this property is not set, the
 			trigger function is ignored and the chip is kept alive
 			until an explicit kill signal is received
+- trigger-delay-ms	The number of milliseconds to wait after trigger line
+			assertion before executing shut down procedure.
+			The default is 2500ms.
 
 Example:
 
@@ -24,6 +27,7 @@ ltc2952 {
 	compatible = "lltc,ltc2952";
 
 	trigger-gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
+	trigger-delay-ms = <2000>;
 	watchdog-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
 	kill-gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
 };

Documentation/devicetree/bindings/power/supply/ab8500/btemp.txt

View before deletion

diff --git a/Documentation/devicetree/bindings/power/supply/ab8500/btemp.txt b/Documentation/devicetree/bindings/power/supply/ab8500/btemp.txt
deleted file mode 100644
index f181e46..0000000
--- a/Documentation/devicetree/bindings/power/supply/ab8500/btemp.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=== AB8500 Battery Temperature Monitor Driver ===
-
-The properties below describes the node for btemp driver.
-
-Required Properties:
-- compatible = Shall be: "stericsson,ab8500-btemp"
-- battery = Shall be battery specific information
-
-	Example:
-	ab8500_btemp {
-		compatible = "stericsson,ab8500-btemp";
-		battery	   = <&ab8500_battery>;
-	};
-
-For information on battery specific node, Ref:
-Documentation/devicetree/bindings/power/supply/ab8500/fg.txt

Documentation/devicetree/bindings/power/supply/ab8500/chargalg.txt

View before deletion

diff --git a/Documentation/devicetree/bindings/power/supply/ab8500/chargalg.txt b/Documentation/devicetree/bindings/power/supply/ab8500/chargalg.txt
deleted file mode 100644
index 56636f9..0000000
--- a/Documentation/devicetree/bindings/power/supply/ab8500/chargalg.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=== AB8500 Charging Algorithm Driver ===
-
-The properties below describes the node for chargalg driver.
-
-Required Properties:
-- compatible = Shall be: "stericsson,ab8500-chargalg"
-- battery = Shall be battery specific information
-
-Example:
-ab8500_chargalg {
-	compatible = "stericsson,ab8500-chargalg";
-	battery	   = <&ab8500_battery>;
-};
-
-For information on battery specific node, Ref:
-Documentation/devicetree/bindings/power/supply/ab8500/fg.txt

Documentation/devicetree/bindings/power/supply/ab8500/charger.txt

View before deletion

diff --git a/Documentation/devicetree/bindings/power/supply/ab8500/charger.txt b/Documentation/devicetree/bindings/power/supply/ab8500/charger.txt
deleted file mode 100644
index 24ada03..0000000
--- a/Documentation/devicetree/bindings/power/supply/ab8500/charger.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-=== AB8500 Charger Driver ===
-
-Required Properties:
-- compatible = Shall be "stericsson,ab8500-charger"
-- battery = Shall be battery specific information
-	Example:
-	ab8500_charger {
-		compatible = "stericsson,ab8500-charger";
-		battery	   = <&ab8500_battery>;
-	};
-
-- vddadc-supply: Supply for USB and Main charger
-	Example:
-	ab8500-charger {
-		vddadc-supply	= <&ab8500_ldo_tvout_reg>;
-	}
-- autopower_cfg:
-	Boolean value depicting the presence of 'automatic poweron after powerloss'
-	Example:
-	ab8500-charger {
-		autopower_cfg;
-	};
-
-For information on battery specific node, Ref:
-Documentation/devicetree/bindings/power/supply/ab8500/fg.txt

Documentation/devicetree/bindings/power/supply/act8945a-charger.txt

View before deletion

diff --git a/Documentation/devicetree/bindings/power/supply/act8945a-charger.txt b/Documentation/devicetree/bindings/power/supply/act8945a-charger.txt
deleted file mode 100644
index cb737a9..0000000
--- a/Documentation/devicetree/bindings/power/supply/act8945a-charger.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-Device-Tree bindings for charger of Active-semi ACT8945A Multi-Function Device
-
-Required properties:
- - compatible: "active-semi,act8945a-charger".
- - active-semi,chglev-gpios: charge current level phandle with args
-   as described in ../gpio/gpio.txt.
- - active-semi,lbo-gpios: specify the low battery voltage detect phandle
-   with args as as described in ../gpio/gpio.txt.
- - interrupts: <a b> where a is the interrupt number and b is a
-   field that represents an encoding of the sense and level
-   information for the interrupt.
-
-Optional properties:
- - active-semi,input-voltage-threshold-microvolt: unit: mV;
-   Specifies the charger's input over-voltage threshold value;
-   The value can be: 6600, 7000, 7500, 8000; default: 6600
- - active-semi,precondition-timeout: unit: minutes;
-   Specifies the charger's PRECONDITION safety timer setting value;
-   The value can be: 40, 60, 80, 0; If 0, it means to disable this timer;
-   default: 40.
- - active-semi,total-timeout: unit: hours;
-   Specifies the charger's total safety timer setting value;
-   The value can be: 3, 4, 5, 0; If 0, it means to disable this timer;
-   default: 3.
-
-Example:
-	pmic@5b {
-		compatible = "active-semi,act8945a";
-		reg = <0x5b>;
-
-		charger {
-			compatible = "active-semi,act8945a-charger";
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_charger_chglev &pinctrl_charger_lbo &pinctrl_charger_irq>;
-			interrupt-parent = <&pioA>;
-			interrupts = <45 IRQ_TYPE_LEVEL_LOW>;
-
-			active-semi,chglev-gpios = <&pioA 12 GPIO_ACTIVE_HIGH>;
-			active-semi,lbo-gpios = <&pioA 72 GPIO_ACTIVE_LOW>;
-			active-semi,input-voltage-threshold-microvolt = <6600>;
-			active-semi,precondition-timeout = <40>;
-			active-semi,total-timeout = <3>;
-		};
-	};

Documentation/devicetree/bindings/power/supply/active-semi,act8945a-charger.yaml

View file

diff --git a/Documentation/devicetree/bindings/power/supply/active-semi,act8945a-charger.yaml b/Documentation/devicetree/bindings/power/supply/active-semi,act8945a-charger.yaml
new file mode 100644
index 0000000..3f74bc1
--- /dev/null
+++ b/Documentation/devicetree/bindings/power/supply/active-semi,act8945a-charger.yaml
@@ -0,0 +1,76 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/power/supply/active-semi,act8945a-charger.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Active-semi ACT8945A Charger Function
+
+maintainers:
+  - Sebastian Reichel <[email protected]>
+
+allOf:
+  - $ref: power-supply.yaml#
+
+properties:
+  compatible:
+    const: active-semi,act8945a-charger
+
+  interrupts:
+    maxItems: 1
+
+  active-semi,chglev-gpios:
+    maxItems: 1
+    description: charge current level GPIO
+
+  active-semi,lbo-gpios:
+    maxItems: 1
+    description: low battery voltage detect GPIO
+
+  active-semi,input-voltage-threshold-microvolt:
+    description: |
+      Specifies the charger's input over-voltage threshold value.
+      Despite the name, specified values are in millivolt (mV).
+      Defaults to 6.6 V
+    enum: [ 6600, 7000, 7500, 8000 ]
+
+  active-semi,precondition-timeout:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description: |
+      Specifies the charger's PRECONDITION safety timer setting value in minutes.
+      If 0, it means to disable this timer.
+      Defaults to 40 minutes.
+    enum: [ 0, 40, 60, 80 ]
+
+  active-semi,total-timeout:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description: |
+      Specifies the charger's total safety timer setting value in hours;
+      If 0, it means to disable this timer;
+      Defaults to 3 hours.
+    enum: [ 0, 3, 4, 5 ]
+
+required:
+  - compatible
+  - interrupts
+  - active-semi,chglev-gpios
+  - active-semi,lbo-gpios
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/gpio/gpio.h>
+    #include <dt-bindings/interrupt-controller/irq.h>
+    pmic {
+      charger {
+        compatible = "active-semi,act8945a-charger";
+        interrupt-parent = <&pioA>;
+        interrupts = <45 IRQ_TYPE_LEVEL_LOW>;
+        active-semi,chglev-gpios = <&pioA 12 GPIO_ACTIVE_HIGH>;
+        active-semi,lbo-gpios = <&pioA 72 GPIO_ACTIVE_LOW>;
+        active-semi,input-voltage-threshold-microvolt = <6600>;
+        active-semi,precondition-timeout = <40>;
+        active-semi,total-timeout = <3>;
+      };
+    };

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

View before deletion

diff --git a/Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt b/Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt
deleted file mode 100644
index 7a1fb53..0000000
--- a/Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-AXP20X and AXP22X PMICs' AC power supply
-
-Required Properties:
- - compatible: One of:
-			"x-powers,axp202-ac-power-supply"
-			"x-powers,axp221-ac-power-supply"
-			"x-powers,axp813-ac-power-supply"
-
-This node is a subnode of the axp20x PMIC.
-
-The AXP20X can read the current current and voltage supplied by AC by
-reading ADC channels from the AXP20X ADC.
-
-The AXP22X is only able to tell if an AC power supply is present and
-usable.
-
-AXP813/AXP803 are able to limit current and supply voltage
-
-Example:
-
-&axp209 {
-	ac_power_supply: ac-power-supply {
-		compatible = "x-powers,axp202-ac-power-supply";
-	};
-};

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

View before deletion

diff --git a/Documentation/devicetree/bindings/power/supply/axp20x_battery.txt b/Documentation/devicetree/bindings/power/supply/axp20x_battery.txt
deleted file mode 100644
index 41916f6..0000000
--- a/Documentation/devicetree/bindings/power/supply/axp20x_battery.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-AXP20x and AXP22x battery power supply
-
-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 its respective PMIC DT node.
-
-The supported devices can read the battery voltage, charge and discharge
-currents of the battery by reading ADC channels from the ADC.
-
-Example:
-
-&axp209 {
-	battery_power_supply: battery-power-supply {
-		compatible = "x-powers,axp209-battery-power-supply";
-	}
-};

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

View before deletion

diff --git a/Documentation/devicetree/bindings/power/supply/axp20x_usb_power.txt b/Documentation/devicetree/bindings/power/supply/axp20x_usb_power.txt
deleted file mode 100644
index b2d4968..0000000
--- a/Documentation/devicetree/bindings/power/supply/axp20x_usb_power.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-AXP20x USB power supply
-
-Required Properties:
--compatible: One of: "x-powers,axp202-usb-power-supply"
-                     "x-powers,axp221-usb-power-supply"
-                     "x-powers,axp223-usb-power-supply"
-		     "x-powers,axp813-usb-power-supply"
-
-The AXP223 PMIC shares most of its behaviour with the AXP221 but has slight
-variations such as the former being able to set the VBUS power supply max
-current to 100mA, unlike the latter.
-
-This node is a subnode of the axp20x PMIC.
-
-Example:
-
-axp209: pmic@34 {
-	compatible = "x-powers,axp209";
-	reg = <0x34>;
-	interrupt-parent = <&nmi_intc>;
-	interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
-	interrupt-controller;
-	#interrupt-cells = <1>;
-
-	regulators {
-		x-powers,dcdc-freq = <1500>;
-
-		vdd_cpu: dcdc2 {
-			regulator-always-on;
-			regulator-min-microvolt = <1000000>;
-			regulator-max-microvolt = <1450000>;
-			regulator-name = "vdd-cpu";
-		};
-
-		...
-	};
-
-	usb-power-supply: usb-power-supply {
-		compatible = "x-powers,axp202-usb-power-supply";
-	};
-};

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

View before deletion

diff --git a/Documentation/devicetree/bindings/power/supply/battery.txt b/Documentation/devicetree/bindings/power/supply/battery.txt
deleted file mode 100644
index a9f80cc..0000000
--- a/Documentation/devicetree/bindings/power/supply/battery.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-The contents of this file has been moved to battery.yaml
-
-Please note that not all charger drivers respect all of the properties.

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

View before deletion

diff --git a/Documentation/devicetree/bindings/power/supply/bq2415x.txt b/Documentation/devicetree/bindings/power/supply/bq2415x.txt
deleted file mode 100644
index d0327f0..0000000
--- a/Documentation/devicetree/bindings/power/supply/bq2415x.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Binding for TI bq2415x Li-Ion Charger
-
-Required properties:
-- compatible: Should contain one of the following:
- * "ti,bq24150"
- * "ti,bq24150"
- * "ti,bq24150a"
- * "ti,bq24151"
- * "ti,bq24151a"
- * "ti,bq24152"
- * "ti,bq24153"
- * "ti,bq24153a"
- * "ti,bq24155"
- * "ti,bq24156"
- * "ti,bq24156a"
- * "ti,bq24158"
-- reg:			   integer, i2c address of the device.
-- ti,current-limit:	   integer, initial maximum current charger can pull
-			   from power supply in mA.
-- ti,weak-battery-voltage: integer, weak battery voltage threshold in mV.
-			   The chip will use slow precharge if battery voltage
-			   is below this value.
-- ti,battery-regulation-voltage: integer, maximum charging voltage in mV.
-- ti,charge-current:	   integer, maximum charging current in mA.
-- ti,termination-current:  integer, charge will be terminated when current in
-			   constant-voltage phase drops below this value (in mA).
-- ti,resistor-sense:	   integer, value of sensing resistor in milliohm.
-
-Optional properties:
-- ti,usb-charger-detection: phandle to usb charger detection device.
-			    (required for auto mode)
-
-Example from Nokia N900:
-
-bq24150a {
-	compatible = "ti,bq24150a";
-	reg = <0x6b>;
-
-	ti,current-limit = <100>;
-	ti,weak-battery-voltage = <3400>;
-	ti,battery-regulation-voltage = <4200>;
-	ti,charge-current = <650>;
-	ti,termination-current = <100>;
-	ti,resistor-sense = <68>;
-
-	ti,usb-charger-detection = <&isp1704>;
-};

Documentation/devicetree/bindings/power/supply/bq2415x.yaml

View file

diff --git a/Documentation/devicetree/bindings/power/supply/bq2415x.yaml b/Documentation/devicetree/bindings/power/supply/bq2415x.yaml
new file mode 100644
index 0000000..f8461f0
--- /dev/null
+++ b/Documentation/devicetree/bindings/power/supply/bq2415x.yaml
@@ -0,0 +1,98 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2021 Sebastian Reichel
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/power/supply/bq2415x.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Binding for TI bq2415x Li-Ion Charger
+
+maintainers:
+  - Sebastian Reichel <[email protected]>
+
+allOf:
+  - $ref: power-supply.yaml#
+
+properties:
+  compatible:
+    enum:
+      - ti,bq24150
+      - ti,bq24150
+      - ti,bq24150a
+      - ti,bq24151
+      - ti,bq24151a
+      - ti,bq24152
+      - ti,bq24153
+      - ti,bq24153a
+      - ti,bq24155
+      - ti,bq24156
+      - ti,bq24156a
+      - ti,bq24158
+
+  reg:
+    maxItems: 1
+
+  ti,current-limit:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description: initial maximum current charger can pull from power supply in mA.
+
+  ti,weak-battery-voltage:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description: |
+      weak battery voltage threshold in mV.
+      The chip will use slow precharge if battery voltage is below this value.
+
+  ti,battery-regulation-voltage:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description: maximum charging voltage in mV.
+
+  ti,charge-current:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description: maximum charging current in mA.
+
+  ti,termination-current:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description: |
+      charge will be terminated when current in constant-voltage phase drops
+      below this value (in mA).
+
+  ti,resistor-sense:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description: value of sensing resistor in milliohm.
+
+  ti,usb-charger-detection:
+    $ref: /schemas/types.yaml#/definitions/phandle
+    description: phandle to usb charger detection device (required for auto mode)
+
+required:
+  - compatible
+  - reg
+  - ti,current-limit
+  - ti,weak-battery-voltage
+  - ti,battery-regulation-voltage
+  - ti,charge-current
+  - ti,termination-current
+  - ti,resistor-sense
+
+additionalProperties: false
+
+examples:
+  - |
+    i2c0 {
+      #address-cells = <1>;
+      #size-cells = <0>;
+
+      charger@6b {
+        compatible = "ti,bq24150a";
+        reg = <0x6b>;
+
+        ti,current-limit = <100>;
+        ti,weak-battery-voltage = <3400>;
+        ti,battery-regulation-voltage = <4200>;
+        ti,charge-current = <650>;
+        ti,termination-current = <100>;
+        ti,resistor-sense = <68>;
+
+        ti,usb-charger-detection = <&isp1704>;
+      };
+    };

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

View before deletion

diff --git a/Documentation/devicetree/bindings/power/supply/bq24190.txt b/Documentation/devicetree/bindings/power/supply/bq24190.txt
deleted file mode 100644
index ffe2be4..0000000
--- a/Documentation/devicetree/bindings/power/supply/bq24190.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-TI BQ24190 Li-Ion Battery Charger
-
-Required properties:
-- compatible: contains one of the following:
-    * "ti,bq24190"
-    * "ti,bq24192"
-    * "ti,bq24192i"
-    * "ti,bq24196"
-- reg: integer, I2C address of the charger.
-- interrupts[-extended]: configuration for charger INT pin.
-
-Optional properties:
-- monitored-battery: phandle of battery characteristics devicetree node
-  The charger uses the following battery properties:
-    + precharge-current-microamp: maximum charge current during precharge
-      phase (typically 20% of battery capacity).
-    + charge-term-current-microamp: a charge cycle terminates when the
-      battery voltage is above recharge threshold, and the current is below
-      this setting (typically 10% of battery capacity).
-  See also Documentation/devicetree/bindings/power/supply/battery.txt
-- ti,system-minimum-microvolt: when power is connected and the battery is below
-  minimum system voltage, the system will be regulated above this setting.
-
-child nodes:
-- usb-otg-vbus:
-  Usage: optional
-  Description: Regulator that is used to control the VBUS voltage direction for
-               either USB host mode or for charging on the OTG port.
-
-Notes:
-- Some circuit boards wire the chip's "OTG" pin high (enabling 500mA default
-  charge current on USB SDP ports, among other features). To simulate this on
-  boards that wire the pin to a GPIO, set a gpio-hog.
-
-Example:
-
-	bat: battery {
-		compatible = "simple-battery";
-		precharge-current-microamp = <256000>;
-		charge-term-current-microamp = <128000>;
-		// etc.
-	};
-
-	bq24190: charger@6a {
-		compatible = "ti,bq24190";
-		reg = <0x6a>;
-		interrupts-extended = <&gpiochip 10 IRQ_TYPE_EDGE_FALLING>;
-		monitored-battery = <&bat>;
-		ti,system-minimum-microvolt = <3200000>;
-
-		usb_otg_vbus: usb-otg-vbus { };
-	};
-
-	&twl_gpio {
-		otg {
-			gpio-hog;
-			gpios = <6 0>;
-			output-high;
-			line-name = "otg-gpio";
-		};
-	};

Documentation/devicetree/bindings/power/supply/bq24190.yaml

View file

diff --git a/Documentation/devicetree/bindings/power/supply/bq24190.yaml b/Documentation/devicetree/bindings/power/supply/bq24190.yaml
new file mode 100644
index 0000000..0d7cbbd
--- /dev/null
+++ b/Documentation/devicetree/bindings/power/supply/bq24190.yaml
@@ -0,0 +1,92 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2021 Sebastian Reichel
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/power/supply/bq24190.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+

This diff is incomplete. Download the complete patch.