| Message ID | 20220303232350.2591143-1-robh@kernel.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v3] dt-bindings: mfd: Fix pinctrl node name warnings | expand |
On 04/03/2022 00:23, 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> > --- > 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(-) > > 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 { DTS also need such change. Best regards, Krzysztof
On Thu, Mar 03, 2022 at 05:23:49PM -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> > --- For the Madera and Lochnagar bits. Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com> Thanks, Charles
On Fri, Mar 4, 2022 at 12:24 AM Rob Herring <robh@kernel.org> 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> > --- > v2: > - Fix lochnagar-pinctrl nodename in example > v3: > - And fix lochnagar-pinctrl nodename in 'required'. Sigh... Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Thu, 03 Mar 2022, 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> > --- > 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(-) Requires rebase. Doesn't presently apply.
On Tue, Mar 22, 2022 at 2:28 AM Lee Jones <lee.jones@linaro.org> wrote: > > On Thu, 03 Mar 2022, 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> > > --- > > 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(-) > > Requires rebase. Doesn't presently apply. It's already in 5.17. Rob
On Wed, 23 Mar 2022, Rob Herring wrote: > On Tue, Mar 22, 2022 at 2:28 AM Lee Jones <lee.jones@linaro.org> wrote: > > > > On Thu, 03 Mar 2022, 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> > > > --- > > > 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(-) > > > > 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.
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..ad285cb480c9 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# @@ -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; 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> --- 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(-)