Skip to contentSkip to conversation

dt-bindings: mfd: Fix pinctrl node name warnings

PATCH In review Rob Herring 5 participants 7 messages Mar 3, 2022 – Mar 23, 2022

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

Rob Herring

author maintainer
#0 lore raw

PATCH v3 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]>

---
v2:
- Fix lochnagar-pinctrl nodename in example
v3:
- And fix lochnagar-pinctrl nodename in 'required'. Sigh...

---
 Documentation/devicetree/bindings/mfd/brcm,cru.yaml         | 4 ++--
 Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml | 6 +++---
 .../devicetree/bindings/pinctrl/cirrus,madera.yaml          | 3 ---
 3 files changed, 5 insertions(+), 8 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 +3 -3
index c00ad3e21c21..ad285cb480c9 100644
@@ -126,7 +126,7 @@ properties:
       clock-frequency:
         const: 12288000
 
-  lochnagar-pinctrl:
+  pinctrl:
     type: object
     $ref: /schemas/pinctrl/cirrus,lochnagar.yaml#
 

@@ -255,7 +255,7 @@ required:
   - reg
   - reset-gpios
   - lochnagar-clk
-  - lochnagar-pinctrl
+  - pinctrl
 
 additionalProperties: false
 

@@ -293,7 +293,7 @@ examples:
                 clock-frequency = <32768>;
             };
 
-            lochnagar-pinctrl {
+            pinctrl {
                 compatible = "cirrus,lochnagar-pinctrl";
 
                 gpio-controller;
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
#1 lore raw
Quoted 41 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]>

---
v2:
- Fix lochnagar-pinctrl nodename in example
v3:
- And fix lochnagar-pinctrl nodename in 'required'. Sigh...

---
 Documentation/devicetree/bindings/mfd/brcm,cru.yaml         | 4 ++--
 Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml | 6 +++---
 .../devicetree/bindings/pinctrl/cirrus,madera.yaml          | 3 ---
 3 files changed, 5 insertions(+), 8 deletions(-)
Documentation/devicetree/bindings/mfd/brcm,cru.yaml +1 -1
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]+$':

Documentation/devicetree/bindings/mfd/brcm,cru.yaml examples: · line 97

Quoted 5 lines
Documentation/devicetree/bindings/mfd/brcm,cru.yaml +1 -1
@@ -94,7 +94,7 @@ examples:
             reg = <0x180 0x4>;
         };
 
-        pin-controller@1c0 {
+        pinctrl@1c0 {

DTS also need such change.

Best regards,
Krzysztof

maintainer Acked-by on v3 1/1
#2 lore raw
In reply to Rob Herring
Quoted 10 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]+)?$'

Quoted 7 lines

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]>

---

For the Madera and Lochnagar bits.

Acked-by Charles Keepax <[email protected]>

Thanks,
Charles

Reviewed-by on v3 1/1
#3 lore raw
In reply to Rob Herring
Quoted 13 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.

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

---
v2:
- Fix lochnagar-pinctrl nodename in example
v3:
- And fix lochnagar-pinctrl nodename in 'required'. Sigh...

Reviewed-by Linus Walleij <[email protected]>

Yours,
Linus Walleij

#4 lore raw
In reply to Rob Herring
Quoted 21 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]>

---
v2:
- Fix lochnagar-pinctrl nodename in example
v3:
- And fix lochnagar-pinctrl nodename in 'required'. Sigh...

Quoted 5 lines
---
 Documentation/devicetree/bindings/mfd/brcm,cru.yaml         | 4 ++--
 Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml | 6 +++---
 .../devicetree/bindings/pinctrl/cirrus,madera.yaml          | 3 ---
 3 files changed, 5 insertions(+), 8 deletions(-)

Requires rebase. Doesn't presently apply.

Signature · 4 lines
Lee Jones [李琼斯]
Principal Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
author maintainer
#5 lore raw
Quoted 30 lines · Lee Jones
Quoted 21 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]>

---
v2:
- Fix lochnagar-pinctrl nodename in example
v3:
- And fix lochnagar-pinctrl nodename in 'required'. Sigh...

Quoted 5 lines
---
 Documentation/devicetree/bindings/mfd/brcm,cru.yaml         | 4 ++--
 Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml | 6 +++---
 .../devicetree/bindings/pinctrl/cirrus,madera.yaml          | 3 ---
 3 files changed, 5 insertions(+), 8 deletions(-)
Quoted 1 line

Requires rebase. Doesn't presently apply.

It's already in 5.17.

Rob

#6 lore raw
Quoted 31 lines · Rob Herring
Quoted 30 lines · Lee Jones
Quoted 26 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]>

---
v2:
- Fix lochnagar-pinctrl nodename in example
v3:
- And fix lochnagar-pinctrl nodename in 'required'. Sigh...

---
 Documentation/devicetree/bindings/mfd/brcm,cru.yaml         | 4 ++--
 Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml | 6 +++---
 .../devicetree/bindings/pinctrl/cirrus,madera.yaml          | 3 ---
 3 files changed, 5 insertions(+), 8 deletions(-)
Quoted 3 lines
Quoted 1 line

Requires rebase. Doesn't presently apply.

It's already in 5.17.

Oh, I see what's happened.

I provided my Ack on v2 *after* this was posted.

Makes sense, thanks.

Signature · 4 lines
Lee Jones [李琼斯]
Principal Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog