| Message ID | 20241005060511.1334049-3-andreas@kemnade.info |
|---|---|
| State | Superseded |
| Headers | show |
| Series | power: supply: twl6030/32 charger | expand |
On Sat, Oct 05, 2024 at 08:05:09AM +0200, Andreas Kemnade wrote: > Also the TWL603X devices have a charger, so allow to specify it here. > > Signed-off-by: Andreas Kemnade <andreas@kemnade.info> > --- > .../devicetree/bindings/mfd/ti,twl.yaml | 30 +++++++++++++++++-- > 1 file changed, 28 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/mfd/ti,twl.yaml b/Documentation/devicetree/bindings/mfd/ti,twl.yaml > index e94b0fd7af0f8..e772d13adbfdc 100644 > --- a/Documentation/devicetree/bindings/mfd/ti,twl.yaml > +++ b/Documentation/devicetree/bindings/mfd/ti,twl.yaml > @@ -54,7 +54,7 @@ allOf: > $ref: /schemas/iio/adc/ti,twl4030-madc.yaml > unevaluatedProperties: false > > - bci: > + charger: > type: object > $ref: /schemas/power/supply/twl4030-charger.yaml > unevaluatedProperties: false > @@ -105,6 +105,11 @@ allOf: > regulator-initial-mode: false > > properties: > + charger: > + type: object > + properties: > + compatible: > + const: ti,twl6030-charger > gpadc: > type: object > properties: > @@ -136,6 +141,13 @@ allOf: > regulator-initial-mode: false > > properties: > + charger: > + type: object > + properties: > + compatible: > + items: > + - const: ti,twl6032-charger > + - const: ti,twl6030-charger > gpadc: > type: object > properties: > @@ -169,6 +181,12 @@ properties: > "#clock-cells": > const: 1 > > + charger: > + type: object > + additionalProperties: true > + properties: > + compatible: true I think the behavior you're after is: required: - compatible Because what you have is true when compatible is not present. With that, Reviewed-by: Rob Herring (Arm) <robh@kernel.org>
diff --git a/Documentation/devicetree/bindings/mfd/ti,twl.yaml b/Documentation/devicetree/bindings/mfd/ti,twl.yaml index e94b0fd7af0f8..e772d13adbfdc 100644 --- a/Documentation/devicetree/bindings/mfd/ti,twl.yaml +++ b/Documentation/devicetree/bindings/mfd/ti,twl.yaml @@ -54,7 +54,7 @@ allOf: $ref: /schemas/iio/adc/ti,twl4030-madc.yaml unevaluatedProperties: false - bci: + charger: type: object $ref: /schemas/power/supply/twl4030-charger.yaml unevaluatedProperties: false @@ -105,6 +105,11 @@ allOf: regulator-initial-mode: false properties: + charger: + type: object + properties: + compatible: + const: ti,twl6030-charger gpadc: type: object properties: @@ -136,6 +141,13 @@ allOf: regulator-initial-mode: false properties: + charger: + type: object + properties: + compatible: + items: + - const: ti,twl6032-charger + - const: ti,twl6030-charger gpadc: type: object properties: @@ -169,6 +181,12 @@ properties: "#clock-cells": const: 1 + charger: + type: object + additionalProperties: true + properties: + compatible: true + rtc: type: object additionalProperties: false @@ -222,6 +240,14 @@ examples: interrupt-controller; #interrupt-cells = <1>; + charger { + compatible = "ti,twl6030-charger"; + interrupts = <2>, <5>; + io-channels = <&gpadc 10>; + io-channel-names = "vusb"; + monitored-battery = <&bat>; + }; + gpadc { compatible = "ti,twl6030-gpadc"; interrupts = <6>; @@ -259,7 +285,7 @@ examples: interrupt-controller; #interrupt-cells = <1>; - bci { + charger { compatible = "ti,twl4030-bci"; interrupts = <9>, <2>; bci3v1-supply = <&vusb3v1>;
Also the TWL603X devices have a charger, so allow to specify it here. Signed-off-by: Andreas Kemnade <andreas@kemnade.info> --- .../devicetree/bindings/mfd/ti,twl.yaml | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-)