[PATCH 0/6] dt-bindings: power: supply: Few cleanups around monitored-battery

[PATCH 0/6] dt-bindings: power: supply: Few cleanups around monitored-battery

[Krzysztof Kozlowski]

Reference the common power supply schema to bring the definition of
monitored-battery property allowing to drop redundant pieces.

Best regards,
Krzysztof

---
Krzysztof Kozlowski (6):
      dt-bindings: power: supply: bq2515x: Add missing power-supply ref
      dt-bindings: power: supply: bq256xx: Add missing power-supply ref
      dt-bindings: power: supply: qcom,pmi8998: Add missing power-supply ref
      dt-bindings: power: supply: richtek,rt5033: Add missing power-supply ref
      dt-bindings: power: supply: summit,smb347: Add missing power-supply ref
      dt-bindings: power: supply: Drop redundant monitored-battery ref

 Documentation/devicetree/bindings/power/supply/bq24190.yaml        | 1 -
 Documentation/devicetree/bindings/power/supply/bq2515x.yaml        | 7 ++++---
 Documentation/devicetree/bindings/power/supply/bq256xx.yaml        | 5 ++---
 Documentation/devicetree/bindings/power/supply/bq25980.yaml        | 4 +---
 Documentation/devicetree/bindings/power/supply/cw2015_battery.yaml | 5 +----
 .../devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml     | 7 ++++---
 .../devicetree/bindings/power/supply/richtek,rt5033-charger.yaml   | 4 +++-
 .../devicetree/bindings/power/supply/stericsson,ab8500-btemp.yaml  | 4 +---
 .../bindings/power/supply/stericsson,ab8500-chargalg.yaml          | 4 +---
 .../bindings/power/supply/stericsson,ab8500-charger.yaml           | 4 +---
 .../devicetree/bindings/power/supply/stericsson,ab8500-fg.yaml     | 4 +---
 .../devicetree/bindings/power/supply/summit,smb347-charger.yaml    | 5 ++---
 .../power/supply/x-powers,axp20x-battery-power-supply.yaml         | 6 +-----
 13 files changed, 22 insertions(+), 38 deletions(-)
---
base-commit: 3be1a7a31fbda82f3604b6c31e4f390110de1b46
change-id: 20250604-dt-bindings-psy-monitored-battery-383ccb383351

Best regards,
-- 
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

[PATCH 1/6] dt-bindings: power: supply: bq2515x: Add missing power-supply ref

[Krzysztof Kozlowski]

Reference the common power supply schema to bring the definition of
monitored-battery property.  Drop also the obvious description because
it is duplicating what is in power-supply.yaml.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 Documentation/devicetree/bindings/power/supply/bq2515x.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/power/supply/bq2515x.yaml b/Documentation/devicetree/bindings/power/supply/bq2515x.yaml
index 845822c87f2a4616c44907a5abaa1cc785be78ea..0e99a218e662b8400a15252fe601234bb51cd12c 100644
--- a/Documentation/devicetree/bindings/power/supply/bq2515x.yaml
+++ b/Documentation/devicetree/bindings/power/supply/bq2515x.yaml
@@ -53,15 +53,16 @@ properties:
     minimum: 50000
     maximum: 500000
 
-  monitored-battery:
-    $ref: /schemas/types.yaml#/definitions/phandle
-    description: phandle to the battery node being monitored
+  monitored-battery: true
 
 required:
   - compatible
   - reg
   - monitored-battery
 
+allOf:
+  - $ref: power-supply.yaml#
+
 additionalProperties: false
 
 examples:

-- 
2.45.2

[PATCH 2/6] dt-bindings: power: supply: bq256xx: Add missing power-supply ref

[Krzysztof Kozlowski]

Reference the common power supply schema to bring the definition of
monitored-battery property.  Drop also the obvious description because
it is duplicating what is in power-supply.yaml.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 Documentation/devicetree/bindings/power/supply/bq256xx.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/power/supply/bq256xx.yaml b/Documentation/devicetree/bindings/power/supply/bq256xx.yaml
index a76afe3ca29922fe73da12126f9e107a4fef270d..8cee37b9879e2a7db9aa5514e9f065eb9a6a6ead 100644
--- a/Documentation/devicetree/bindings/power/supply/bq256xx.yaml
+++ b/Documentation/devicetree/bindings/power/supply/bq256xx.yaml
@@ -58,9 +58,7 @@ properties:
     minimum: 100000
     maximum: 3200000
 
-  monitored-battery:
-    $ref: /schemas/types.yaml#/definitions/phandle
-    description: phandle to the battery node being monitored
+  monitored-battery: true
 
   interrupts:
     maxItems: 1
@@ -78,6 +76,7 @@ required:
   - monitored-battery
 
 allOf:
+  - $ref: power-supply.yaml#
   - if:
       properties:
         compatible:

-- 
2.45.2

[PATCH 3/6] dt-bindings: power: supply: qcom,pmi8998: Add missing power-supply ref

[Krzysztof Kozlowski]

Reference the common power supply schema to bring the definition of
monitored-battery property.  Drop also the obvious description because
it is duplicating what is in power-supply.yaml.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 .../devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml b/Documentation/devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml
index 90c7dc7632c58dc5cbfb3abcde8e730882bfd936..70f5cd6eaeabe822babf567d92b1d7f9124f3680 100644
--- a/Documentation/devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml
+++ b/Documentation/devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml
@@ -38,9 +38,7 @@ properties:
       - const: usbin_i
       - const: usbin_v
 
-  monitored-battery:
-    description: phandle to the simple-battery node
-    $ref: /schemas/types.yaml#/definitions/phandle
+  monitored-battery: true
 
 required:
   - compatible
@@ -51,6 +49,9 @@ required:
   - io-channel-names
   - monitored-battery
 
+allOf:
+  - $ref: power-supply.yaml#
+
 additionalProperties: false
 
 examples:

-- 
2.45.2

[PATCH 4/6] dt-bindings: power: supply: richtek,rt5033: Add missing power-supply ref

[Krzysztof Kozlowski]

Reference the common power supply schema to bring the definition of
monitored-battery property.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 .../devicetree/bindings/power/supply/richtek,rt5033-charger.yaml      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml b/Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml
index 5b3edd79a523ff7f8f04cadc425c208a63cd8f85..d91eced9f5fb0b330c91aa61e0be9aa6bee52ae4 100644
--- a/Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml
+++ b/Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml
@@ -18,7 +18,6 @@ properties:
     const: richtek,rt5033-charger
 
   monitored-battery:
-    $ref: /schemas/types.yaml#/definitions/phandle
     description: |
       Phandle to the monitored battery according to battery.yaml. The battery
       node needs to contain five parameters.
@@ -54,6 +53,9 @@ properties:
 required:
   - monitored-battery
 
+allOf:
+  - $ref: power-supply.yaml#
+
 additionalProperties: false
 
 examples:

-- 
2.45.2

[PATCH 5/6] dt-bindings: power: supply: summit,smb347: Add missing power-supply ref

[Krzysztof Kozlowski]

Reference the common power supply schema to bring the definition of
monitored-battery property.  Drop also the obvious description because
it is duplicating what is in power-supply.yaml.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 .../devicetree/bindings/power/supply/summit,smb347-charger.yaml      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml b/Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml
index 2d552becbfe6cb08c72f2a5584bdddc67443a2e4..65ed92bb05f30f91e24978d3261c7f29e4233e2b 100644
--- a/Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml
+++ b/Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml
@@ -23,9 +23,7 @@ properties:
   interrupts:
     maxItems: 1
 
-  monitored-battery:
-    description: phandle to the battery node
-    $ref: /schemas/types.yaml#/definitions/phandle
+  monitored-battery: true
 
   summit,enable-usb-charging:
     type: boolean
@@ -94,6 +92,7 @@ properties:
     unevaluatedProperties: false
 
 allOf:
+  - $ref: power-supply.yaml#
   - if:
       properties:
         compatible:

-- 
2.45.2

[PATCH 6/6] dt-bindings: power: supply: Drop redundant monitored-battery ref

[Krzysztof Kozlowski]

Bindings reference the common power supply schema, which already defines
the type (ref) for "monitored-battery" property.  Drop the redundant ref
from individual device schemas along with obvious description also
duplicating what is in power-supply.yaml.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 Documentation/devicetree/bindings/power/supply/bq24190.yaml         | 1 -
 Documentation/devicetree/bindings/power/supply/bq25980.yaml         | 4 +---
 Documentation/devicetree/bindings/power/supply/cw2015_battery.yaml  | 5 +----
 .../devicetree/bindings/power/supply/stericsson,ab8500-btemp.yaml   | 4 +---
 .../bindings/power/supply/stericsson,ab8500-chargalg.yaml           | 4 +---
 .../devicetree/bindings/power/supply/stericsson,ab8500-charger.yaml | 4 +---
 .../devicetree/bindings/power/supply/stericsson,ab8500-fg.yaml      | 4 +---
 .../bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml | 6 +-----
 8 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/Documentation/devicetree/bindings/power/supply/bq24190.yaml b/Documentation/devicetree/bindings/power/supply/bq24190.yaml
index 307c99c077217ab4b5fac30694a4a316dd51f8e4..ac9a76fc5876bef101bfd5c44e4a759288cd1c58 100644
--- a/Documentation/devicetree/bindings/power/supply/bq24190.yaml
+++ b/Documentation/devicetree/bindings/power/supply/bq24190.yaml
@@ -48,7 +48,6 @@ properties:
       battery device.
 
   monitored-battery:
-    $ref: /schemas/types.yaml#/definitions/phandle
     description: |
       phandle to a "simple-battery" compatible node.
 
diff --git a/Documentation/devicetree/bindings/power/supply/bq25980.yaml b/Documentation/devicetree/bindings/power/supply/bq25980.yaml
index 256adbef55ebf83f00181d07696c2182787195c1..0b5d005dc7809418073a4d8925fc4937c3a38dcd 100644
--- a/Documentation/devicetree/bindings/power/supply/bq25980.yaml
+++ b/Documentation/devicetree/bindings/power/supply/bq25980.yaml
@@ -73,9 +73,7 @@ properties:
     description: |
       Indicates that the device state has changed.
 
-  monitored-battery:
-    $ref: /schemas/types.yaml#/definitions/phandle
-    description: phandle to the battery node being monitored
+  monitored-battery: true
 
 required:
   - compatible
diff --git a/Documentation/devicetree/bindings/power/supply/cw2015_battery.yaml b/Documentation/devicetree/bindings/power/supply/cw2015_battery.yaml
index dc697b6147b2130d6b234c26d19edbbcca5a1dff..f7bde324153d8b2144cf90dd850165c2e8d8088e 100644
--- a/Documentation/devicetree/bindings/power/supply/cw2015_battery.yaml
+++ b/Documentation/devicetree/bindings/power/supply/cw2015_battery.yaml
@@ -43,10 +43,7 @@ properties:
     minItems: 1
     maxItems: 8 # Should be enough
 
-  monitored-battery:
-    description:
-      Specifies the phandle of a simple-battery connected to this gauge
-    $ref: /schemas/types.yaml#/definitions/phandle
+  monitored-battery: true
 
 required:
   - compatible
diff --git a/Documentation/devicetree/bindings/power/supply/stericsson,ab8500-btemp.yaml b/Documentation/devicetree/bindings/power/supply/stericsson,ab8500-btemp.yaml
index 525abdfb3e2d456bb4afc8e8890cf86be2545ef7..c464aa82255a6839e8416ab84b3f6fdbffb7ec1e 100644
--- a/Documentation/devicetree/bindings/power/supply/stericsson,ab8500-btemp.yaml
+++ b/Documentation/devicetree/bindings/power/supply/stericsson,ab8500-btemp.yaml
@@ -17,9 +17,7 @@ properties:
   compatible:
     const: stericsson,ab8500-btemp
 
-  monitored-battery:
-    $ref: /schemas/types.yaml#/definitions/phandle
-    description: phandle to battery node
+  monitored-battery: true
 
   battery:
     $ref: /schemas/types.yaml#/definitions/phandle
diff --git a/Documentation/devicetree/bindings/power/supply/stericsson,ab8500-chargalg.yaml b/Documentation/devicetree/bindings/power/supply/stericsson,ab8500-chargalg.yaml
index 10bbdcfc87b68feacf2f420cf0675f6323e9dbfa..39914b9e0cf58adffc21c28aa6bfb50e82c04757 100644
--- a/Documentation/devicetree/bindings/power/supply/stericsson,ab8500-chargalg.yaml
+++ b/Documentation/devicetree/bindings/power/supply/stericsson,ab8500-chargalg.yaml
@@ -17,9 +17,7 @@ properties:
   compatible:
     const: stericsson,ab8500-chargalg
 
-  monitored-battery:
-    $ref: /schemas/types.yaml#/definitions/phandle
-    description: phandle to battery node
+  monitored-battery: true
 
   battery:
     $ref: /schemas/types.yaml#/definitions/phandle
diff --git a/Documentation/devicetree/bindings/power/supply/stericsson,ab8500-charger.yaml b/Documentation/devicetree/bindings/power/supply/stericsson,ab8500-charger.yaml
index e33329b3af6196c8d66f0b32f57cfb14e38f22f8..994fac12c8da0632c05626caa0201524377a7a6d 100644
--- a/Documentation/devicetree/bindings/power/supply/stericsson,ab8500-charger.yaml
+++ b/Documentation/devicetree/bindings/power/supply/stericsson,ab8500-charger.yaml
@@ -17,9 +17,7 @@ properties:
   compatible:
     const: stericsson,ab8500-charger
 
-  monitored-battery:
-    $ref: /schemas/types.yaml#/definitions/phandle
-    description: phandle to battery node
+  monitored-battery: true
 
   battery:
     $ref: /schemas/types.yaml#/definitions/phandle
diff --git a/Documentation/devicetree/bindings/power/supply/stericsson,ab8500-fg.yaml b/Documentation/devicetree/bindings/power/supply/stericsson,ab8500-fg.yaml
index 6a724ca90e9965a8a0bceb6d262ecb283e1af005..92e4eb08fd6101936cf74e8aaa34760ed483cb0b 100644
--- a/Documentation/devicetree/bindings/power/supply/stericsson,ab8500-fg.yaml
+++ b/Documentation/devicetree/bindings/power/supply/stericsson,ab8500-fg.yaml
@@ -17,9 +17,7 @@ properties:
   compatible:
     const: stericsson,ab8500-fg
 
-  monitored-battery:
-    $ref: /schemas/types.yaml#/definitions/phandle
-    description: phandle to battery node
+  monitored-battery: true
 
   battery:
     $ref: /schemas/types.yaml#/definitions/phandle
diff --git a/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml b/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml
index 3504c76a01d8df2daaf12d91bd86379807a718bd..a90d558e7f864eb8dfbf49490945fa227c91f0d4 100644
--- a/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml
+++ b/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml
@@ -26,11 +26,7 @@ properties:
           - const: x-powers,axp813-battery-power-supply
       - const: x-powers,axp813-battery-power-supply
 
-  monitored-battery:
-    description:
-      Specifies the phandle of an optional simple-battery connected to
-      this gauge.
-    $ref: /schemas/types.yaml#/definitions/phandle
+  monitored-battery: true
 
   x-powers,no-thermistor:
     type: boolean

-- 
2.45.2

Re: [PATCH 5/6] dt-bindings: power: supply: summit,smb347: Add missing power-supply ref

[David Heidelberg]

Thank you,

Reviewed-by: David Heidelberg <david@ixit.cz>


On 04/06/2025 10:18, Krzysztof Kozlowski wrote:
> Reference the common power supply schema to bring the definition of
> monitored-battery property.  Drop also the obvious description because
> it is duplicating what is in power-supply.yaml.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
>   .../devicetree/bindings/power/supply/summit,smb347-charger.yaml      | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml b/Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml
> index 2d552becbfe6cb08c72f2a5584bdddc67443a2e4..65ed92bb05f30f91e24978d3261c7f29e4233e2b 100644
> --- a/Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml
> @@ -23,9 +23,7 @@ properties:
>     interrupts:
>       maxItems: 1
>   
> -  monitored-battery:
> -    description: phandle to the battery node
> -    $ref: /schemas/types.yaml#/definitions/phandle
> +  monitored-battery: true
>   
>     summit,enable-usb-charging:
>       type: boolean
> @@ -94,6 +92,7 @@ properties:
>       unevaluatedProperties: false
>   
>   allOf:
> +  - $ref: power-supply.yaml#
>     - if:
>         properties:
>           compatible:
> 

Re: [PATCH 6/6] dt-bindings: power: supply: Drop redundant monitored-battery ref

[Linus Walleij]

On Wed, Jun 4, 2025 at 10:19 AM Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:

> Bindings reference the common power supply schema, which already defines
> the type (ref) for "monitored-battery" property.  Drop the redundant ref
> from individual device schemas along with obvious description also
> duplicating what is in power-supply.yaml.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH 3/6] dt-bindings: power: supply: qcom,pmi8998: Add missing power-supply ref

[Casey Connolly]

On 6/4/25 10:18, Krzysztof Kozlowski wrote:
> Reference the common power supply schema to bring the definition of
> monitored-battery property.  Drop also the obvious description because
> it is duplicating what is in power-supply.yaml.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Reviewed-by: Casey Connolly <casey.connolly@linaro.org>> ---
>   .../devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml     | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml b/Documentation/devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml
> index 90c7dc7632c58dc5cbfb3abcde8e730882bfd936..70f5cd6eaeabe822babf567d92b1d7f9124f3680 100644
> --- a/Documentation/devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml
> @@ -38,9 +38,7 @@ properties:
>         - const: usbin_i
>         - const: usbin_v
>   
> -  monitored-battery:
> -    description: phandle to the simple-battery node
> -    $ref: /schemas/types.yaml#/definitions/phandle
> +  monitored-battery: true
>   
>   required:
>     - compatible
> @@ -51,6 +49,9 @@ required:
>     - io-channel-names
>     - monitored-battery
>   
> +allOf:
> +  - $ref: power-supply.yaml#
> +
>   additionalProperties: false
>   
>   examples:
> 

-- 
Casey (she/they)

Re: [PATCH 0/6] dt-bindings: power: supply: Few cleanups around monitored-battery

[Sebastian Reichel]

On Wed, 04 Jun 2025 10:18:20 +0200, Krzysztof Kozlowski wrote:
> Reference the common power supply schema to bring the definition of
> monitored-battery property allowing to drop redundant pieces.
> 
> Best regards,
> Krzysztof
> 

Applied, thanks!

[1/6] dt-bindings: power: supply: bq2515x: Add missing power-supply ref
      commit: 0dc41c6b18b8fdd959c56f2d5b61a2d0960e3d91
[2/6] dt-bindings: power: supply: bq256xx: Add missing power-supply ref
      commit: 0835608458bc4bd1afb15d108c6d8a3b8b3d5767
[3/6] dt-bindings: power: supply: qcom,pmi8998: Add missing power-supply ref
      commit: 860cb8df5a622f2044a65f98c4158a7ff9c5b07c
[4/6] dt-bindings: power: supply: richtek,rt5033: Add missing power-supply ref
      commit: 221e08ebf6271eb80c6cb77df9ad3586229920e9
[5/6] dt-bindings: power: supply: summit,smb347: Add missing power-supply ref
      commit: 128c0704821e7101257951c1d32459e2fc3e591b
[6/6] dt-bindings: power: supply: Drop redundant monitored-battery ref
      commit: da32b6d7bcdd7a7cfd5f77418a1c026bc3374113

Best regards,
-- 
Sebastian Reichel <sebastian.reichel@collabora.com>