Message ID | 20210307171553.72591-1-paul@crapouillou.net |
---|---|
State | New |
Headers | show |
Series | [1/3] dt-bindings/timer: ingenic: Add compatible strings for JZ4760(B) | expand |
On Sun, 07 Mar 2021 17:15:51 +0000, Paul Cercueil wrote: > Add compatible strings to support the system timer, clocksource, OST, > watchdog and PWM blocks of the JZ4760 and JZ4760B SoCs. > > Newer SoCs which behave like the JZ4760 or JZ4760B now see their > compatible string require a fallback compatible string that corresponds > to one of these two SoCs. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > --- > .../bindings/timer/ingenic,tcu.yaml | 28 ++++++++++++++----- > 1 file changed, 21 insertions(+), 7 deletions(-) > My bot found errors running 'make dt_binding_check' on your patch: yamllint warnings/errors: ./Documentation/devicetree/bindings/timer/ingenic,tcu.yaml:62:13: [warning] wrong indentation: expected 14 but found 12 (indentation) ./Documentation/devicetree/bindings/timer/ingenic,tcu.yaml:201:17: [warning] wrong indentation: expected 18 but found 16 (indentation) dtschema/dtc warnings/errors: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/timer/ingenic,tcu.example.dt.yaml: timer@10002000: timer@e0:compatible: 'oneOf' conditional failed, one must be fixed: ['ingenic,jz4770-ost'] is too short 'ingenic,jz4770-ost' is not one of ['ingenic,jz4725b-ost', 'ingenic,jz4760b-ost'] 'ingenic,jz4760-ost' was expected From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/timer/ingenic,tcu.yaml See https://patchwork.ozlabs.org/patch/1448709 This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit.
Le lun. 8 mars 2021 à 10:39, Rob Herring <robh@kernel.org> a écrit : > On Sun, 07 Mar 2021 17:15:51 +0000, Paul Cercueil wrote: >> Add compatible strings to support the system timer, clocksource, >> OST, >> watchdog and PWM blocks of the JZ4760 and JZ4760B SoCs. >> >> Newer SoCs which behave like the JZ4760 or JZ4760B now see their >> compatible string require a fallback compatible string that >> corresponds >> to one of these two SoCs. >> >> Signed-off-by: Paul Cercueil <paul@crapouillou.net> >> --- >> .../bindings/timer/ingenic,tcu.yaml | 28 >> ++++++++++++++----- >> 1 file changed, 21 insertions(+), 7 deletions(-) >> > > My bot found errors running 'make dt_binding_check' on your patch: > > yamllint warnings/errors: > ./Documentation/devicetree/bindings/timer/ingenic,tcu.yaml:62:13: > [warning] wrong indentation: expected 14 but found 12 (indentation) > ./Documentation/devicetree/bindings/timer/ingenic,tcu.yaml:201:17: > [warning] wrong indentation: expected 18 but found 16 (indentation) > > dtschema/dtc warnings/errors: > /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/timer/ingenic,tcu.example.dt.yaml: > timer@10002000: timer@e0:compatible: 'oneOf' conditional failed, one > must be fixed: > ['ingenic,jz4770-ost'] is too short > 'ingenic,jz4770-ost' is not one of ['ingenic,jz4725b-ost', > 'ingenic,jz4760b-ost'] > 'ingenic,jz4760-ost' was expected > From schema: > /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/timer/ingenic,tcu.yaml Totally my fault, looks like I didn't check the bindings before sending the patchset. I'll V2. -Paul > See https://patchwork.ozlabs.org/patch/1448709 > > This check can fail if there are any dependencies. The base for a > patch > series is generally the most recent rc1. > > If you already ran 'make dt_binding_check' and didn't see the above > error(s), then make sure 'yamllint' is installed and dt-schema is up > to > date: > > pip3 install dtschema --upgrade > > Please check and re-submit.
diff --git a/Documentation/devicetree/bindings/timer/ingenic,tcu.yaml b/Documentation/devicetree/bindings/timer/ingenic,tcu.yaml index 024bcad75101..26561fe72076 100644 --- a/Documentation/devicetree/bindings/timer/ingenic,tcu.yaml +++ b/Documentation/devicetree/bindings/timer/ingenic,tcu.yaml @@ -20,6 +20,8 @@ select: enum: - ingenic,jz4740-tcu - ingenic,jz4725b-tcu + - ingenic,jz4760-tcu + - ingenic,jz4760b-tcu - ingenic,jz4770-tcu - ingenic,jz4780-tcu - ingenic,x1000-tcu @@ -52,12 +54,15 @@ properties: - enum: - ingenic,jz4740-tcu - ingenic,jz4725b-tcu - - ingenic,jz4770-tcu + - ingenic,jz4760-tcu - ingenic,x1000-tcu - const: simple-mfd - items: - - const: ingenic,jz4780-tcu - - const: ingenic,jz4770-tcu + - enum: + - ingenic,jz4780-tcu + - ingenic,jz4770-tcu + - ingenic,jz4760b-tcu + - const: ingenic,jz4760-tcu - const: simple-mfd reg: @@ -118,6 +123,8 @@ patternProperties: - items: - enum: - ingenic,jz4770-watchdog + - ingenic,jz4760b-watchdog + - ingenic,jz4760-watchdog - ingenic,jz4725b-watchdog - const: ingenic,jz4740-watchdog @@ -147,6 +154,8 @@ patternProperties: - ingenic,jz4725b-pwm - items: - enum: + - ingenic,jz4760-pwm + - ingenic,jz4760b-pwm - ingenic,jz4770-pwm - ingenic,jz4780-pwm - const: ingenic,jz4740-pwm @@ -183,10 +192,15 @@ patternProperties: oneOf: - enum: - ingenic,jz4725b-ost - - ingenic,jz4770-ost + - ingenic,jz4760b-ost + - items: + - const: ingenic,jz4760-ost + - const: ingenic,jz4725b-ost - items: - - const: ingenic,jz4780-ost - - const: ingenic,jz4770-ost + - enum: + - ingenic,jz4780-ost + - ingenic,jz4770-ost + - const: ingenic,jz4760b-ost reg: maxItems: 1 @@ -226,7 +240,7 @@ examples: #include <dt-bindings/clock/jz4770-cgu.h> #include <dt-bindings/clock/ingenic,tcu.h> tcu: timer@10002000 { - compatible = "ingenic,jz4770-tcu", "simple-mfd"; + compatible = "ingenic,jz4770-tcu", "ingenic,jz4760-tcu", "simple-mfd"; reg = <0x10002000 0x1000>; #address-cells = <1>; #size-cells = <1>;
Add compatible strings to support the system timer, clocksource, OST, watchdog and PWM blocks of the JZ4760 and JZ4760B SoCs. Newer SoCs which behave like the JZ4760 or JZ4760B now see their compatible string require a fallback compatible string that corresponds to one of these two SoCs. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- .../bindings/timer/ingenic,tcu.yaml | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-)