On 27/06/24 19:41, Krzysztof Kozlowski wrote: > On 27/06/2024 06:33, Chris Packham wrote: >> Add a compatible string for the interrupt controller found on the >> rtl930x SoCs. The interrupt controller has registers for VPE1 so these >> are added as a second reg cell. >> >> Signed-off-by: Chris Packham <chris.packham@xxxxxxxxxxxxxxxxxxx> >> --- >> >> Notes: >> Changes in v3: >> - Use items to describe the regs property >> Changes in v2: >> - Set reg:maxItems to 2 to allow for VPE1 registers on the rtl9300. Add >> a condition to enforce the old limit on other SoCs. >> - Connor and Krzysztof offered acks on v1 but I think the changes here >> are big enough to void those. >> >> .../interrupt-controller/realtek,rtl-intc.yaml | 18 +++++++++++++++++- >> 1 file changed, 17 insertions(+), 1 deletion(-) >> >> diff --git a/Documentation/devicetree/bindings/interrupt-controller/realtek,rtl-intc.yaml b/Documentation/devicetree/bindings/interrupt-controller/realtek,rtl-intc.yaml >> index fb5593724059..d0e5bdf45d05 100644 >> --- a/Documentation/devicetree/bindings/interrupt-controller/realtek,rtl-intc.yaml >> +++ b/Documentation/devicetree/bindings/interrupt-controller/realtek,rtl-intc.yaml >> @@ -25,6 +25,7 @@ properties: >> - items: >> - enum: >> - realtek,rtl8380-intc >> + - realtek,rtl9300-intc >> - const: realtek,rtl-intc >> - const: realtek,rtl-intc >> deprecated: true >> @@ -35,7 +36,9 @@ properties: >> const: 1 >> >> reg: >> - maxItems: 1 > Missing minItems (as testing would tell you) Hmm I really did test this. Even now running `make ARCH=mips O=build_mips DT_SCHEMA_FILES=realtek,rtl-intc.yaml:realtek-rtl.yaml:realtek,otto-timer.yaml clean dt_binding_check` doesn't seem to yield any complaints. Am I testing this properly? > >> + items: >> + - description: vpe0 registers >> + - description: vpe1 registers >> >> interrupts: >> minItems: 1 >> @@ -71,6 +74,19 @@ allOf: >> else: >> required: >> - interrupts >> + - if: >> + properties: >> + compatible: >> + contains: >> + const: realtek,rtl9300-intc >> + then: >> + properties: >> + reg: > Needed is: minItems: 2 > >> + maxItems: 2 >> + else: >> + properties: >> + reg: >> + maxItems: 1 >> >> additionalProperties: false >> > Best regards, > Krzysztof >
