Skip to contentSkip to conversation

dt-bindings: mfd: Fix pinctrl node name warnings

PATCH Superseded Rob Herring 2 participants 3 messages Mar 3, 2022 – Mar 4, 2022

Subsystems (6)
Device tree bindings GPIO Multifunction devices (MFD) Pin control +2 more subsystems

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/1 dt-bindings: mfd: Fix pinctrl node name warnings

The recent addition pinctrl.yaml in commit c09acbc499e8 ("dt-bindings:
pinctrl: use pinctrl.yaml") resulted in some node name warnings:

Documentation/devicetree/bindings/mfd/cirrus,lochnagar.example.dt.yaml: \
lochnagar-pinctrl: $nodename:0: 'lochnagar-pinctrl' does not match '^(pinctrl|pinmux)(@[0-9a-f]+)?$'
Documentation/devicetree/bindings/mfd/cirrus,madera.example.dt.yaml: \
codec@1a: $nodename:0: 'codec@1a' does not match '^(pinctrl|pinmux)(@[0-9a-f]+)?$'
Documentation/devicetree/bindings/mfd/brcm,cru.example.dt.yaml: \
pin-controller@1c0: $nodename:0: 'pin-controller@1c0' does not match '^(pinctrl|pinmux)(@[0-9a-f]+)?$'

Fix the node names to the preferred 'pinctrl'. For cirrus,madera, nothing from pinctrl.yaml schema is used, so just drop the reference.

Fixes c09acbc499e8 ("dt-bindings: pinctrl: use pinctrl.yaml")
Cc Rafał Miłecki <[email protected]>
Signed-off-by Rob Herring <[email protected]>
---
 Documentation/devicetree/bindings/mfd/brcm,cru.yaml          | 4 ++--
 Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml  | 2 +-
 Documentation/devicetree/bindings/pinctrl/cirrus,madera.yaml | 3 ---
 3 files changed, 3 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/mfd/brcm,cru.yaml +2 -2
index be4a2df71c25..b85819fbb07c 100644
@@ -39,7 +39,7 @@ patternProperties:
   '^phy@[a-f0-9]+$':
     $ref: ../phy/bcm-ns-usb2-phy.yaml
 
-  '^pin-controller@[a-f0-9]+$':
+  '^pinctrl@[a-f0-9]+$':
     $ref: ../pinctrl/brcm,ns-pinmux.yaml
 
   '^syscon@[a-f0-9]+$':

@@ -94,7 +94,7 @@ examples:
             reg = <0x180 0x4>;
         };
 
-        pin-controller@1c0 {
+        pinctrl@1c0 {
             compatible = "brcm,bcm4708-pinmux";
             reg = <0x1c0 0x24>;
             reg-names = "cru_gpio_control";
Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml +1 -1
index c00ad3e21c21..975a46f3c46f 100644
@@ -126,7 +126,7 @@ properties:
       clock-frequency:
         const: 12288000
 
-  lochnagar-pinctrl:
+  pinctrl:
     type: object
     $ref: /schemas/pinctrl/cirrus,lochnagar.yaml#
Documentation/devicetree/bindings/pinctrl/cirrus,madera.yaml +0 -3
index c85f759ae5a3..8a90d8273767 100644
@@ -107,9 +107,6 @@ properties:
 
     additionalProperties: false
 
-allOf:
-  - $ref: "pinctrl.yaml#"
-
 required:
   - pinctrl-0
   - pinctrl-names
Signature · 1 line
2.32.0
maintainer
#1 lore raw
Quoted 22 lines · Rob Herring

The recent addition pinctrl.yaml in commit c09acbc499e8 ("dt-bindings:
pinctrl: use pinctrl.yaml") resulted in some node name warnings:

Documentation/devicetree/bindings/mfd/cirrus,lochnagar.example.dt.yaml: \
lochnagar-pinctrl: $nodename:0: 'lochnagar-pinctrl' does not match '^(pinctrl|pinmux)(@[0-9a-f]+)?$'
Documentation/devicetree/bindings/mfd/cirrus,madera.example.dt.yaml: \
codec@1a: $nodename:0: 'codec@1a' does not match '^(pinctrl|pinmux)(@[0-9a-f]+)?$'
Documentation/devicetree/bindings/mfd/brcm,cru.example.dt.yaml: \
pin-controller@1c0: $nodename:0: 'pin-controller@1c0' does not match '^(pinctrl|pinmux)(@[0-9a-f]+)?$'

Fix the node names to the preferred 'pinctrl'. For cirrus,madera, nothing from pinctrl.yaml schema is used, so just drop the reference.

Fixes c09acbc499e8 ("dt-bindings: pinctrl: use pinctrl.yaml")
Cc Rafał Miłecki <[email protected]>
Signed-off-by Rob Herring <[email protected]>

---

Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml +0 -0
index c00ad3e21c21..975a46f3c46f 100644

Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml properties: · line 132

Quoted 8 lines
Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml +1 -1
@@ -126,7 +126,7 @@ properties:
       clock-frequency:
         const: 12288000
 
-  lochnagar-pinctrl:
+  pinctrl:
     type: object
     $ref: /schemas/pinctrl/cirrus,lochnagar.yaml#

We also need to update the required properties and the example here.

Thanks,
Charles

author maintainer
#2 lore raw
Quoted 26 lines · Charles Keepax
Quoted 25 lines · Rob Herring

The recent addition pinctrl.yaml in commit c09acbc499e8 ("dt-bindings:
pinctrl: use pinctrl.yaml") resulted in some node name warnings:

Documentation/devicetree/bindings/mfd/cirrus,lochnagar.example.dt.yaml: \
lochnagar-pinctrl: $nodename:0: 'lochnagar-pinctrl' does not match '^(pinctrl|pinmux)(@[0-9a-f]+)?$'
Documentation/devicetree/bindings/mfd/cirrus,madera.example.dt.yaml: \
codec@1a: $nodename:0: 'codec@1a' does not match '^(pinctrl|pinmux)(@[0-9a-f]+)?$'
Documentation/devicetree/bindings/mfd/brcm,cru.example.dt.yaml: \
pin-controller@1c0: $nodename:0: 'pin-controller@1c0' does not match '^(pinctrl|pinmux)(@[0-9a-f]+)?$'

Fix the node names to the preferred 'pinctrl'. For cirrus,madera, nothing from pinctrl.yaml schema is used, so just drop the reference.

Fixes c09acbc499e8 ("dt-bindings: pinctrl: use pinctrl.yaml")
Cc Rafał Miłecki <[email protected]>
Signed-off-by Rob Herring <[email protected]>

---

Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml +0 -0
index c00ad3e21c21..975a46f3c46f 100644
@@ -126,7 +126,7 @@ properties:
       clock-frequency:
         const: 12288000
Quoted 7 lines

Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml properties: · line 132

Quoted 5 lines
Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml +1 -1
-  lochnagar-pinctrl:
+  pinctrl:
     type: object
     $ref: /schemas/pinctrl/cirrus,lochnagar.yaml#

We also need to update the required properties and the example here.

Yes, see v3.

Rob