| Message ID | 20220303194737.2258809-1-robh@kernel.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | dt-bindings: mfd: Fix pinctrl node name warnings | expand |
On Thu, Mar 03, 2022 at 01:47:37PM -0600, Rob Herring wrote: > 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 <rafal@milecki.pl> > Signed-off-by: Rob Herring <robh@kernel.org> > --- > diff --git a/Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml b/Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml > index c00ad3e21c21..975a46f3c46f 100644 > --- a/Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml > +++ b/Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml > @@ -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
On Fri, Mar 04, 2022 at 09:58:37AM +0000, Charles Keepax wrote: > On Thu, Mar 03, 2022 at 01:47:37PM -0600, Rob Herring wrote: > > 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 <rafal@milecki.pl> > > Signed-off-by: Rob Herring <robh@kernel.org> > > --- > > diff --git a/Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml b/Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml > > index c00ad3e21c21..975a46f3c46f 100644 > > --- a/Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml > > +++ b/Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml > > @@ -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. Yes, see v3. Rob
diff --git a/Documentation/devicetree/bindings/mfd/brcm,cru.yaml b/Documentation/devicetree/bindings/mfd/brcm,cru.yaml index be4a2df71c25..b85819fbb07c 100644 --- a/Documentation/devicetree/bindings/mfd/brcm,cru.yaml +++ b/Documentation/devicetree/bindings/mfd/brcm,cru.yaml @@ -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"; diff --git a/Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml b/Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml index c00ad3e21c21..975a46f3c46f 100644 --- a/Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml +++ b/Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml @@ -126,7 +126,7 @@ properties: clock-frequency: const: 12288000 - lochnagar-pinctrl: + pinctrl: type: object $ref: /schemas/pinctrl/cirrus,lochnagar.yaml# diff --git a/Documentation/devicetree/bindings/pinctrl/cirrus,madera.yaml b/Documentation/devicetree/bindings/pinctrl/cirrus,madera.yaml index c85f759ae5a3..8a90d8273767 100644 --- a/Documentation/devicetree/bindings/pinctrl/cirrus,madera.yaml +++ b/Documentation/devicetree/bindings/pinctrl/cirrus,madera.yaml @@ -107,9 +107,6 @@ properties: additionalProperties: false -allOf: - - $ref: "pinctrl.yaml#" - required: - pinctrl-0 - pinctrl-names
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 <rafal@milecki.pl> Signed-off-by: Rob Herring <robh@kernel.org> --- 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(-)