2022-04-22 20:17:14

by icenowy

[permalink] [raw]
Subject: [PATCH 1/2] dt-bindings: thermal: sun8i-thermal: add binding for R329 THS

From: Icenowy Zheng <[email protected]>

R329 has a thermal sensor controller that has only one sensor, and the
structure of it is like the H6 one.

Add device tree binding for it.

Signed-off-by: Icenowy Zheng <[email protected]>
---
.../devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml | 3 +++
1 file changed, 3 insertions(+)

diff --git a/Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml b/Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml
index 6e0b110153b0..87b4103e0a5f 100644
--- a/Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml
+++ b/Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml
@@ -20,6 +20,7 @@ properties:
- allwinner,sun50i-a100-ths
- allwinner,sun50i-h5-ths
- allwinner,sun50i-h6-ths
+ - allwinner,sun50i-r329-ths

clocks:
minItems: 1
@@ -63,6 +64,7 @@ allOf:
enum:
- allwinner,sun50i-a100-ths
- allwinner,sun50i-h6-ths
+ - allwinner,sun50i-r329-ths

then:
properties:
@@ -85,6 +87,7 @@ allOf:
compatible:
contains:
const: allwinner,sun8i-h3-ths
+ const: allwinner,sun8i-r329-ths

then:
properties:
--
2.35.1


2022-04-22 23:12:40

by Vasily Khoruzhick

[permalink] [raw]
Subject: Re: [PATCH 1/2] dt-bindings: thermal: sun8i-thermal: add binding for R329 THS

On Fri, Apr 22, 2022 at 9:12 AM <[email protected]> wrote:
>
> From: Icenowy Zheng <[email protected]>
>
> R329 has a thermal sensor controller that has only one sensor, and the
> structure of it is like the H6 one.
>
> Add device tree binding for it.
>
> Signed-off-by: Icenowy Zheng <[email protected]>
> ---
> .../devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml b/Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml
> index 6e0b110153b0..87b4103e0a5f 100644
> --- a/Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml
> +++ b/Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml
> @@ -20,6 +20,7 @@ properties:
> - allwinner,sun50i-a100-ths
> - allwinner,sun50i-h5-ths
> - allwinner,sun50i-h6-ths
> + - allwinner,sun50i-r329-ths
>
> clocks:
> minItems: 1
> @@ -63,6 +64,7 @@ allOf:
> enum:
> - allwinner,sun50i-a100-ths
> - allwinner,sun50i-h6-ths
> + - allwinner,sun50i-r329-ths
>
> then:
> properties:
> @@ -85,6 +87,7 @@ allOf:
> compatible:
> contains:
> const: allwinner,sun8i-h3-ths
> + const: allwinner,sun8i-r329-ths
>
> then:
> properties:

There's also a check at line #99 that requires clock, clock-names and
resets properties for thermal sensors in other Allwinner SoCs. Are
these not required for r329?

Also are you planning to add a node for thermal sensor to r329 dtsi?


> --
> 2.35.1
>

2022-04-22 23:14:47

by Rob Herring (Arm)

[permalink] [raw]
Subject: Re: [PATCH 1/2] dt-bindings: thermal: sun8i-thermal: add binding for R329 THS

On Sat, 23 Apr 2022 00:11:55 +0800, [email protected] wrote:
> From: Icenowy Zheng <[email protected]>
>
> R329 has a thermal sensor controller that has only one sensor, and the
> structure of it is like the H6 one.
>
> Add device tree binding for it.
>
> Signed-off-by: Icenowy Zheng <[email protected]>
> ---
> .../devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml | 3 +++
> 1 file changed, 3 insertions(+)
>

My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
on your patch (DT_CHECKER_FLAGS is new in v5.13):

yamllint warnings/errors:
./Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml:90:13: [error] duplication of key "const" in mapping (key-duplicates)

dtschema/dtc warnings/errors:
make[1]: *** Deleting file 'Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.example.dts'
Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml: found duplicate key "const" with value "allwinner,sun8i-r329-ths" (original value: "allwinner,sun8i-h3-ths")
make[1]: *** [Documentation/devicetree/bindings/Makefile:26: Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.example.dts] Error 1
make[1]: *** Waiting for unfinished jobs....
Traceback (most recent call last):
File "/usr/local/bin/dt-doc-validate", line 25, in check_doc
testtree = dtschema.load(filename, line_number=line_number)
File "/usr/local/lib/python3.10/dist-packages/dtschema/lib.py", line 912, in load
return yaml.load(f.read())
File "/usr/local/lib/python3.10/dist-packages/ruamel/yaml/main.py", line 434, in load
return constructor.get_single_data()
File "/usr/local/lib/python3.10/dist-packages/ruamel/yaml/constructor.py", line 121, in get_single_data
return self.construct_document(node)
File "/usr/local/lib/python3.10/dist-packages/ruamel/yaml/constructor.py", line 131, in construct_document
for _dummy in generator:
File "/usr/local/lib/python3.10/dist-packages/ruamel/yaml/constructor.py", line 674, in construct_yaml_map
value = self.construct_mapping(node)
File "/usr/local/lib/python3.10/dist-packages/ruamel/yaml/constructor.py", line 445, in construct_mapping
return BaseConstructor.construct_mapping(self, node, deep=deep)
File "/usr/local/lib/python3.10/dist-packages/ruamel/yaml/constructor.py", line 263, in construct_mapping
if self.check_mapping_key(node, key_node, mapping, key, value):
File "/usr/local/lib/python3.10/dist-packages/ruamel/yaml/constructor.py", line 294, in check_mapping_key
raise DuplicateKeyError(*args)
ruamel.yaml.constructor.DuplicateKeyError: while constructing a mapping
in "<unicode string>", line 89, column 13
found duplicate key "const" with value "allwinner,sun8i-r329-ths" (original value: "allwinner,sun8i-h3-ths")
in "<unicode string>", line 90, column 13

To suppress this check see:
http://yaml.readthedocs.io/en/latest/api.html#duplicate-keys


During handling of the above exception, another exception occurred:

Traceback (most recent call last):
File "/usr/local/bin/dt-doc-validate", line 74, in <module>
ret = check_doc(f)
File "/usr/local/bin/dt-doc-validate", line 30, in check_doc
print(filename + ":", exc.path[-1], exc.message, file=sys.stderr)
AttributeError: 'DuplicateKeyError' object has no attribute 'path'
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml: ignoring, error parsing file
make: *** [Makefile:1401: dt_binding_check] Error 2

doc reference errors (make refcheckdocs):

See https://patchwork.ozlabs.org/patch/

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.

2022-04-23 06:35:56

by Icenowy Zheng

[permalink] [raw]
Subject: Re: [PATCH 1/2] dt-bindings: thermal: sun8i-thermal: add binding for R329 THS

在 2022-04-22星期五的 11:44 -0700,Vasily Khoruzhick写道:
> On Fri, Apr 22, 2022 at 9:12 AM <[email protected]> wrote:
> >
> > From: Icenowy Zheng <[email protected]>
> >
> > R329 has a thermal sensor controller that has only one sensor, and
> > the
> > structure of it is like the H6 one.
> >
> > Add device tree binding for it.
> >
> > Signed-off-by: Icenowy Zheng <[email protected]>
> > ---
> >  .../devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml  | 3
> > +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git
> > a/Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-
> > ths.yaml
> > b/Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-
> > ths.yaml
> > index 6e0b110153b0..87b4103e0a5f 100644
> > --- a/Documentation/devicetree/bindings/thermal/allwinner,sun8i-
> > a83t-ths.yaml
> > +++ b/Documentation/devicetree/bindings/thermal/allwinner,sun8i-
> > a83t-ths.yaml
> > @@ -20,6 +20,7 @@ properties:
> >        - allwinner,sun50i-a100-ths
> >        - allwinner,sun50i-h5-ths
> >        - allwinner,sun50i-h6-ths
> > +      - allwinner,sun50i-r329-ths
> >
> >    clocks:
> >      minItems: 1
> > @@ -63,6 +64,7 @@ allOf:
> >              enum:
> >                - allwinner,sun50i-a100-ths
> >                - allwinner,sun50i-h6-ths
> > +              - allwinner,sun50i-r329-ths
> >
> >      then:
> >        properties:
> > @@ -85,6 +87,7 @@ allOf:
> >          compatible:
> >            contains:
> >              const: allwinner,sun8i-h3-ths
> > +            const: allwinner,sun8i-r329-ths
> >
> >      then:
> >        properties:
>
> There's also a check at line #99 that requires clock, clock-names and
> resets properties for thermal sensors in other Allwinner SoCs. Are
> these not required for r329?

Thanks for this tip, I will add R329 to this check in the next
revision.

>
> Also are you planning to add a node for thermal sensor to r329 dtsi?
>
>
> > --
> > 2.35.1
> >