| Message ID | 20230530144851.92059-3-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 05b743db9d8cc4e51b3eb77889d24ab9aa2bf169 |
| Headers | show |
| Series | dt-bindings: restrict node name suffixes | expand |
* Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> [230530 14:49]: > Make the pattern matching node names a bit stricter to improve DTS > consistency. The pattern is restricted to: > 1. Only one unit address or one -N suffix, > 2. -N suffixes to decimal numbers. > > Suggested-by: Rob Herring <robh@kernel.org> > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Tony Lindgren <tony@atomide.com>
On Tue, May 30, 2023 at 04:48:46PM +0200, Krzysztof Kozlowski wrote: > Make the pattern matching node names a bit stricter to improve DTS > consistency. The pattern is restricted to: > 1. Only one unit address or one -N suffix, > 2. -N suffixes to decimal numbers. > > Suggested-by: Rob Herring <robh@kernel.org> > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > --- > > Cc: Tony Lindgren <tony@atomide.com> > Cc: Oleksij Rempel <o.rempel@pengutronix.de> > --- > Documentation/devicetree/bindings/pwm/pwm.yaml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/pwm/pwm.yaml b/Documentation/devicetree/bindings/pwm/pwm.yaml > index 3c01f85029e5..abd9fa873354 100644 > --- a/Documentation/devicetree/bindings/pwm/pwm.yaml > +++ b/Documentation/devicetree/bindings/pwm/pwm.yaml > @@ -13,7 +13,7 @@ select: false > > properties: > $nodename: > - pattern: "^pwm(@.*|-[0-9a-f])*$" > + pattern: "^pwm(@.*|-([0-9]|[1-9][0-9]+))?$" With this patch we forbid now the following patterns: pwm-[0-9a-f][@-].* pwm-0[0-9a-f]+ pwm-[a-f]([@-].*)? Checking for such names: $ git grep -oP '\bpwm-([0-9a-f][@-].*|0[0-9a-f]+|[0-9]*[a-f][0-9a-f]*)(*pla:\s*\{)' arch/*/boot/dts arch/arm/boot/dts/meson8.dtsi:pwm-f-ao arch/arm/boot/dts/meson8.dtsi:pwm-e arch/arm/boot/dts/meson8b.dtsi:pwm-d arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-a arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-b-x7 arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-b-x19 arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-c-c arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-c-x5 arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-c-x8 arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-d-x3 arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-d-x6 arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-e arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-f-z arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-f-a arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-f-x arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-f-h arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-a-e These are all pinmux-settings and no pwm nodes, so the change is fine. (But arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi isn't properly sorted alphabetically.) Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Best regards and Thanks Uwe
On 07/06/2023 09:36, Uwe Kleine-König wrote: > On Tue, May 30, 2023 at 04:48:46PM +0200, Krzysztof Kozlowski wrote: >> Make the pattern matching node names a bit stricter to improve DTS >> consistency. The pattern is restricted to: >> 1. Only one unit address or one -N suffix, >> 2. -N suffixes to decimal numbers. >> >> Suggested-by: Rob Herring <robh@kernel.org> >> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > >> >> --- >> >> Cc: Tony Lindgren <tony@atomide.com> >> Cc: Oleksij Rempel <o.rempel@pengutronix.de> >> --- >> Documentation/devicetree/bindings/pwm/pwm.yaml | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/Documentation/devicetree/bindings/pwm/pwm.yaml b/Documentation/devicetree/bindings/pwm/pwm.yaml >> index 3c01f85029e5..abd9fa873354 100644 >> --- a/Documentation/devicetree/bindings/pwm/pwm.yaml >> +++ b/Documentation/devicetree/bindings/pwm/pwm.yaml >> @@ -13,7 +13,7 @@ select: false >> >> properties: >> $nodename: >> - pattern: "^pwm(@.*|-[0-9a-f])*$" >> + pattern: "^pwm(@.*|-([0-9]|[1-9][0-9]+))?$" > > With this patch we forbid now the following patterns: > > pwm-[0-9a-f][@-].* > pwm-0[0-9a-f]+ > pwm-[a-f]([@-].*)? Yes, this was discussed last time: https://lore.kernel.org/all/20221127182232.GA128974-robh@kernel.org/ > > Checking for such names: > > $ git grep -oP '\bpwm-([0-9a-f][@-].*|0[0-9a-f]+|[0-9]*[a-f][0-9a-f]*)(*pla:\s*\{)' arch/*/boot/dts > arch/arm/boot/dts/meson8.dtsi:pwm-f-ao > arch/arm/boot/dts/meson8.dtsi:pwm-e > arch/arm/boot/dts/meson8b.dtsi:pwm-d > arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-a > arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-b-x7 > arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-b-x19 > arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-c-c > arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-c-x5 > arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-c-x8 > arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-d-x3 > arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-d-x6 > arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-e > arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-f-z > arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-f-a > arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-f-x > arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-f-h > arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:pwm-a-e Are you sure these are pwms, not pins? > > These are all pinmux-settings and no pwm nodes, so the change is fine. > (But arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi isn't properly > sorted alphabetically.) Exactly... > > Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Best regards, Krzysztof
On Tue, 30 May 2023 16:48:46 +0200, Krzysztof Kozlowski wrote: > Make the pattern matching node names a bit stricter to improve DTS > consistency. The pattern is restricted to: > 1. Only one unit address or one -N suffix, > 2. -N suffixes to decimal numbers. > > Suggested-by: Rob Herring <robh@kernel.org> > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > --- > > Cc: Tony Lindgren <tony@atomide.com> > Cc: Oleksij Rempel <o.rempel@pengutronix.de> > --- > Documentation/devicetree/bindings/pwm/pwm.yaml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Acked-by: Rob Herring <robh@kernel.org>
diff --git a/Documentation/devicetree/bindings/pwm/pwm.yaml b/Documentation/devicetree/bindings/pwm/pwm.yaml index 3c01f85029e5..abd9fa873354 100644 --- a/Documentation/devicetree/bindings/pwm/pwm.yaml +++ b/Documentation/devicetree/bindings/pwm/pwm.yaml @@ -13,7 +13,7 @@ select: false properties: $nodename: - pattern: "^pwm(@.*|-[0-9a-f])*$" + pattern: "^pwm(@.*|-([0-9]|[1-9][0-9]+))?$" "#pwm-cells": description:
Make the pattern matching node names a bit stricter to improve DTS consistency. The pattern is restricted to: 1. Only one unit address or one -N suffix, 2. -N suffixes to decimal numbers. Suggested-by: Rob Herring <robh@kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- Cc: Tony Lindgren <tony@atomide.com> Cc: Oleksij Rempel <o.rempel@pengutronix.de> --- Documentation/devicetree/bindings/pwm/pwm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)