Message ID | 20230613130011.305589-8-linux@rasmusvillemoes.dk |
---|---|
State | Superseded |
Headers | show |
Series | [v2,1/8] rtc: isl12022: remove wrong warning for low battery level | expand |
On 13/06/2023 15:00, Rasmus Villemoes wrote: > The isl12022 has a dual-purpose irq/f_out pin, which can either be > used as an interrupt or clock output. > > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> > --- > .../devicetree/bindings/rtc/intersil,isl12022.yaml | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/Documentation/devicetree/bindings/rtc/intersil,isl12022.yaml b/Documentation/devicetree/bindings/rtc/intersil,isl12022.yaml > index d5d3a687a34d..a9ef68b5fdcd 100644 > --- a/Documentation/devicetree/bindings/rtc/intersil,isl12022.yaml > +++ b/Documentation/devicetree/bindings/rtc/intersil,isl12022.yaml > @@ -11,6 +11,13 @@ maintainers: > > allOf: > - $ref: rtc.yaml# > + # If #clock-cells is present, interrupts must not be present > + - if: > + required: > + - '#clock-cells' > + then: > + properties: > + interrupts: false Entire allOf block should be like in example-schema, so before unevaluatedProperties. Please put it in correct place in your first patch so here it does not have to be moved. Best regards, Krzysztof
On 13/06/2023 21.10, Krzysztof Kozlowski wrote: > On 13/06/2023 15:00, Rasmus Villemoes wrote: >> diff --git a/Documentation/devicetree/bindings/rtc/intersil,isl12022.yaml b/Documentation/devicetree/bindings/rtc/intersil,isl12022.yaml >> index d5d3a687a34d..a9ef68b5fdcd 100644 >> --- a/Documentation/devicetree/bindings/rtc/intersil,isl12022.yaml >> +++ b/Documentation/devicetree/bindings/rtc/intersil,isl12022.yaml >> @@ -11,6 +11,13 @@ maintainers: >> >> allOf: >> - $ref: rtc.yaml# >> + # If #clock-cells is present, interrupts must not be present >> + - if: >> + required: >> + - '#clock-cells' >> + then: >> + properties: >> + interrupts: false > > Entire allOf block should be like in example-schema, so before > unevaluatedProperties. Please put it in correct place in your first > patch so here it does not have to be moved. > OK. That first patch was basically a copy-paste of c690048ed59b, and e.g. ingenic,rtc.yaml has a similar non-trivial allOf block between maintainers and properties. Is there somehow I could have known it should be right before unevaluatedProperties? Rasmus
On 13/06/2023 22:25, Rasmus Villemoes wrote: > On 13/06/2023 21.10, Krzysztof Kozlowski wrote: >> On 13/06/2023 15:00, Rasmus Villemoes wrote: > >>> diff --git a/Documentation/devicetree/bindings/rtc/intersil,isl12022.yaml b/Documentation/devicetree/bindings/rtc/intersil,isl12022.yaml >>> index d5d3a687a34d..a9ef68b5fdcd 100644 >>> --- a/Documentation/devicetree/bindings/rtc/intersil,isl12022.yaml >>> +++ b/Documentation/devicetree/bindings/rtc/intersil,isl12022.yaml >>> @@ -11,6 +11,13 @@ maintainers: >>> >>> allOf: >>> - $ref: rtc.yaml# >>> + # If #clock-cells is present, interrupts must not be present >>> + - if: >>> + required: >>> + - '#clock-cells' >>> + then: >>> + properties: >>> + interrupts: false >> >> Entire allOf block should be like in example-schema, so before >> unevaluatedProperties. Please put it in correct place in your first >> patch so here it does not have to be moved. >> > > OK. That first patch was basically a copy-paste of c690048ed59b, and > e.g. ingenic,rtc.yaml has a similar non-trivial allOf block between > maintainers and properties. Is there somehow I could have known it > should be right before unevaluatedProperties? The trivial - with a $ref - we keep often at the top. But once it starts growing, should be at the bottom. Since you know it will grow, just put it at the bottom (not total bottom, but like in example-schema, so after required:). Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/rtc/intersil,isl12022.yaml b/Documentation/devicetree/bindings/rtc/intersil,isl12022.yaml index d5d3a687a34d..a9ef68b5fdcd 100644 --- a/Documentation/devicetree/bindings/rtc/intersil,isl12022.yaml +++ b/Documentation/devicetree/bindings/rtc/intersil,isl12022.yaml @@ -11,6 +11,13 @@ maintainers: allOf: - $ref: rtc.yaml# + # If #clock-cells is present, interrupts must not be present + - if: + required: + - '#clock-cells' + then: + properties: + interrupts: false properties: compatible: @@ -22,6 +29,9 @@ properties: interrupts: maxItems: 1 + '#clock-cells': + const: 0 + isil,trip-level85-microvolt: description: | The battery voltage at which the first alarm should trigger
The isl12022 has a dual-purpose irq/f_out pin, which can either be used as an interrupt or clock output. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- .../devicetree/bindings/rtc/intersil,isl12022.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+)