Skip to contentSkip to conversation

dt-bindings: pinctrl: renesas,rza2: Use 'additionalProperties' for child nodes

PATCH In review Rob Herring 4 participants 5 messages Aug 19, 2023 – Aug 23, 2023

Subsystems (4)
Device tree bindings GPIO Pin control Pin controller - Renesas
lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/1 dt-bindings: pinctrl: renesas,rza2: Use 'additionalProperties' for child nodes

A schema under 'additionalProperties' works better for matching any property/node other than the ones explicitly listed. Convert the schema to use that rather than the wildcard and if/then schema.

Drop 'phandle' properties which never need to be explicitly listed while we're here.

Signed-off-by Rob Herring <[email protected]>
---
 .../pinctrl/renesas,rza2-pinctrl.yaml         | 61 +++++++++----------
 1 file changed, 28 insertions(+), 33 deletions(-)
Documentation/devicetree/bindings/pinctrl/renesas,rza2-pinctrl.yaml +28 -33
index 37173a64fed2..8271e7b2c162 100644
@@ -37,40 +37,37 @@ properties:
   gpio-ranges:
     maxItems: 1
 
-patternProperties:
-  "^.*$":
-    if:
-      type: object
-    then:
-      allOf:
-        - $ref: pincfg-node.yaml#
-        - $ref: pinmux-node.yaml#
+additionalProperties:
+  type: object
+
+  allOf:
+    - $ref: pincfg-node.yaml#
+    - $ref: pinmux-node.yaml#
+
+  description:
+    The child nodes of the pin controller designate pins to be used for
+    specific peripheral functions or as GPIO.
+
+    A pin multiplexing sub-node describes how to configure a set of
+    (or a single) pin in some desired alternate function mode.
+    The values for the pinmux properties are a combination of port name,
+    pin number and the desired function index. Use the RZA2_PINMUX macro
+    located in include/dt-bindings/pinctrl/r7s9210-pinctrl.h to easily
+    define these.
+    For assigning GPIO pins, use the macro RZA2_PIN also in
+    to express the desired port pin.
+
+  properties:
+    pinmux:
       description:
-        The child nodes of the pin controller designate pins to be used for
-        specific peripheral functions or as GPIO.
+        Values are constructed from GPIO port number, pin number, and
+        alternate function configuration number using the RZA2_PINMUX()
+        helper macro in r7s9210-pinctrl.h.
 
-        A pin multiplexing sub-node describes how to configure a set of
-        (or a single) pin in some desired alternate function mode.
-        The values for the pinmux properties are a combination of port name,
-        pin number and the desired function index. Use the RZA2_PINMUX macro
-        located in include/dt-bindings/pinctrl/r7s9210-pinctrl.h to easily
-        define these.
-        For assigning GPIO pins, use the macro RZA2_PIN also in
-        to express the desired port pin.
+  required:
+    - pinmux
 
-      properties:
-        phandle: true
-
-        pinmux:
-          description:
-            Values are constructed from GPIO port number, pin number, and
-            alternate function configuration number using the RZA2_PINMUX()
-            helper macro in r7s9210-pinctrl.h.
-
-      required:
-        - pinmux
-
-      additionalProperties: false
+  additionalProperties: false
 
 allOf:
   - $ref: pinctrl.yaml#

@@ -82,8 +79,6 @@ required:
   - '#gpio-cells'
   - gpio-ranges
 
-additionalProperties: false
-
 examples:
   - |
     #include <dt-bindings/pinctrl/r7s9210-pinctrl.h>
Signature · 1 line
2.40.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Rob Herring

A schema under 'additionalProperties' works better for matching any property/node other than the ones explicitly listed. Convert the schema to use that rather than the wildcard and if/then schema.

Drop 'phandle' properties which never need to be explicitly listed while we're here.

Signed-off-by Rob Herring <[email protected]>
Reviewed-by Krzysztof Kozlowski <[email protected]>

Best regards,
Krzysztof

#2 lore raw
In reply to Rob Herring
Quoted 8 lines · Rob Herring

A schema under 'additionalProperties' works better for matching any property/node other than the ones explicitly listed. Convert the schema to use that rather than the wildcard and if/then schema.

Drop 'phandle' properties which never need to be explicitly listed while we're here.

Signed-off-by Rob Herring <[email protected]>

Looks good to me, but Geert usually handles Renesas stuff so not applying unless I get asked explicitly to do so.

Yours,
Linus Walleij

Reviewed-by Acked-by
#3 lore raw

Hi Linus,

Quoted 9 lines · Linus Walleij
Quoted 8 lines · Rob Herring

A schema under 'additionalProperties' works better for matching any property/node other than the ones explicitly listed. Convert the schema to use that rather than the wildcard and if/then schema.

Drop 'phandle' properties which never need to be explicitly listed while we're here.

Signed-off-by Rob Herring <[email protected]>
Reviewed-by Geert Uytterhoeven <[email protected]>
Acked-by Geert Uytterhoeven <[email protected]>
Quoted 2 lines

Looks good to me, but Geert usually handles Renesas stuff so not applying unless I get asked explicitly to do so.

Unless some new bugs show up (hold wood etc.), I do not plan to send more pin control PRs for v6.5 or v6.6, so please take it. Thanks!

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
#4 lore raw
In reply to Rob Herring
Quoted 8 lines · Rob Herring

A schema under 'additionalProperties' works better for matching any property/node other than the ones explicitly listed. Convert the schema to use that rather than the wildcard and if/then schema.

Drop 'phandle' properties which never need to be explicitly listed while we're here.

Signed-off-by Rob Herring <[email protected]>

Patch applied to the pinctrl tree.

Yours,
Linus Walleij