| Message ID | 20221118223728.1721589-1-robh@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7621aabdae410cfc0c28358baab7ae13c551aa7c |
| Headers | show |
| Series | dt-bindings: Add missing start and/or end of line regex anchors | expand |
On Fri, Nov 18, 2022 at 11:38 PM Rob Herring <robh@kernel.org> wrote: > > json-schema patterns by default will match anywhere in a string, so > typically we want at least the start or end anchored. Fix the obvious > cases where the anchors were forgotten. > > Signed-off-by: Rob Herring <robh@kernel.org> > --- > .../devicetree/bindings/pci/mediatek,mt7621-pcie.yaml | 2 +- Acked-by: Sergio Paracuellos <sergio.paracuellos@gmail.com> Thanks, Sergio Paracuellos
On Fri, Nov 18, 2022 at 04:37:27PM -0600, Rob Herring wrote: > json-schema patterns by default will match anywhere in a string, so > typically we want at least the start or end anchored. Fix the obvious > cases where the anchors were forgotten. Acked-by: Mark Brown <broonie@kernel.org>
On Fri, Nov 18, 2022 at 04:37:27PM -0600, Rob Herring wrote: > json-schema patterns by default will match anywhere in a string, so > typically we want at least the start or end anchored. Fix the obvious > cases where the anchors were forgotten. > > Signed-off-by: Rob Herring <robh@kernel.org> > Acked-by: Sergio Paracuellos <sergio.paracuellos@gmail.com> > Acked-by: Mark Brown <broonie@kernel.org> > --- > .../devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 2 +- > Documentation/devicetree/bindings/hwmon/adt7475.yaml | 4 ++-- For hwmon: Acked-by: Guenter Roeck <linux@roeck-us.net> > .../bindings/opp/allwinner,sun50i-h6-operating-points.yaml | 4 ++-- > .../devicetree/bindings/pci/mediatek,mt7621-pcie.yaml | 2 +- > .../devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml | 2 +- > Documentation/devicetree/bindings/regulator/max8660.yaml | 2 +- > .../devicetree/bindings/regulator/maxim,max77802.yaml | 2 +- > Documentation/devicetree/bindings/regulator/regulator.yaml | 2 +- > .../devicetree/bindings/regulator/rohm,bd9576-regulator.yaml | 2 +- > Documentation/devicetree/bindings/sound/renesas,rsnd.yaml | 2 +- > .../devicetree/bindings/spi/nvidia,tegra210-quad.yaml | 2 +- > 11 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml b/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml > index a11e1b867379..3c00ad09eeaa 100644 > --- a/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml > +++ b/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml > @@ -38,7 +38,7 @@ properties: > type: object > > patternProperties: > - 'cpu@[0-9a-f]+': > + '^cpu@[0-9a-f]+$': > type: object > > properties: > diff --git a/Documentation/devicetree/bindings/hwmon/adt7475.yaml b/Documentation/devicetree/bindings/hwmon/adt7475.yaml > index ea595102a86e..051c976ab711 100644 > --- a/Documentation/devicetree/bindings/hwmon/adt7475.yaml > +++ b/Documentation/devicetree/bindings/hwmon/adt7475.yaml > @@ -61,7 +61,7 @@ patternProperties: > $ref: /schemas/types.yaml#/definitions/uint32 > enum: [0, 1] > > - "adi,pin(5|10)-function": > + "^adi,pin(5|10)-function$": > description: | > Configures the function for pin 5 on the adi,adt7473 and adi,adt7475. Or > pin 10 on the adi,adt7476 and adi,adt7490. > @@ -70,7 +70,7 @@ patternProperties: > - pwm2 > - smbalert# > > - "adi,pin(9|14)-function": > + "^adi,pin(9|14)-function$": > description: | > Configures the function for pin 9 on the adi,adt7473 and adi,adt7475. Or > pin 14 on the adi,adt7476 and adi,adt7490 > diff --git a/Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml b/Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml > index 385b0692261c..51f62c3ae194 100644 > --- a/Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml > +++ b/Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml > @@ -41,7 +41,7 @@ required: > - nvmem-cells > > patternProperties: > - "opp-[0-9]+": > + "^opp-[0-9]+$": > type: object > > properties: > @@ -49,7 +49,7 @@ patternProperties: > clock-latency-ns: true > > patternProperties: > - "opp-microvolt-.*": true > + "^opp-microvolt-speed[0-9]$": true > > required: > - opp-hz > diff --git a/Documentation/devicetree/bindings/pci/mediatek,mt7621-pcie.yaml b/Documentation/devicetree/bindings/pci/mediatek,mt7621-pcie.yaml > index d60f43fd9c5a..e63e6458cea8 100644 > --- a/Documentation/devicetree/bindings/pci/mediatek,mt7621-pcie.yaml > +++ b/Documentation/devicetree/bindings/pci/mediatek,mt7621-pcie.yaml > @@ -31,7 +31,7 @@ properties: > maxItems: 2 > > patternProperties: > - 'pcie@[0-2],0': > + '^pcie@[0-2],0$': > type: object > $ref: /schemas/pci/pci-bus.yaml# > > diff --git a/Documentation/devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml b/Documentation/devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml > index 0f18cceba3d5..5a0d64d3ae6b 100644 > --- a/Documentation/devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml > +++ b/Documentation/devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml > @@ -65,7 +65,7 @@ properties: > maxItems: 1 > > patternProperties: > - 'usb@[0-1],0': > + '^usb@[0-1],0$': > type: object > > description: > diff --git a/Documentation/devicetree/bindings/regulator/max8660.yaml b/Documentation/devicetree/bindings/regulator/max8660.yaml > index 9c038698f880..4d550ca396eb 100644 > --- a/Documentation/devicetree/bindings/regulator/max8660.yaml > +++ b/Documentation/devicetree/bindings/regulator/max8660.yaml > @@ -24,7 +24,7 @@ properties: > type: object > > patternProperties: > - "regulator-.+": > + "^regulator-.+$": > $ref: "regulator.yaml#" > > additionalProperties: false > diff --git a/Documentation/devicetree/bindings/regulator/maxim,max77802.yaml b/Documentation/devicetree/bindings/regulator/maxim,max77802.yaml > index 71138c611b6c..b704f05ea454 100644 > --- a/Documentation/devicetree/bindings/regulator/maxim,max77802.yaml > +++ b/Documentation/devicetree/bindings/regulator/maxim,max77802.yaml > @@ -77,7 +77,7 @@ patternProperties: > regulator-initial-mode: false > > patternProperties: > - regulator-state-(standby|mem|disk): > + "^regulator-state-(standby|mem|disk)$": > type: object > additionalProperties: true > properties: > diff --git a/Documentation/devicetree/bindings/regulator/regulator.yaml b/Documentation/devicetree/bindings/regulator/regulator.yaml > index 6e8aa9eed3aa..53b81d8a2d41 100644 > --- a/Documentation/devicetree/bindings/regulator/regulator.yaml > +++ b/Documentation/devicetree/bindings/regulator/regulator.yaml > @@ -231,7 +231,7 @@ patternProperties: > ".*-supply$": > description: Input supply phandle(s) for this node > > - regulator-state-(standby|mem|disk): > + "^regulator-state-(standby|mem|disk)$": > type: object > description: > sub-nodes for regulator state in Standby, Suspend-to-RAM, and > diff --git a/Documentation/devicetree/bindings/regulator/rohm,bd9576-regulator.yaml b/Documentation/devicetree/bindings/regulator/rohm,bd9576-regulator.yaml > index 7cb74cc8c5d9..54be194bb244 100644 > --- a/Documentation/devicetree/bindings/regulator/rohm,bd9576-regulator.yaml > +++ b/Documentation/devicetree/bindings/regulator/rohm,bd9576-regulator.yaml > @@ -21,7 +21,7 @@ description: | > regulator-voutl1, regulator-vouts1 > > patternProperties: > - "regulator-.+": > + "^regulator-.+$": > type: object > description: > Properties for single regulator. > diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml > index 679a246dd666..7df40c38e865 100644 > --- a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml > +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml > @@ -115,7 +115,7 @@ properties: > ports: > $ref: /schemas/graph.yaml#/properties/ports > patternProperties: > - port(@[0-9a-f]+)?: > + '^port(@[0-9a-f]+)?$': > $ref: audio-graph-port.yaml# > unevaluatedProperties: false > > diff --git a/Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml b/Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml > index 6b733e5c1163..899100e783c9 100644 > --- a/Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml > +++ b/Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml > @@ -48,7 +48,7 @@ properties: > - const: tx > > patternProperties: > - "@[0-9a-f]+": > + "@[0-9a-f]+$": > type: object > > properties:
Hi Rob, > From: Rob Herring, Sent: Saturday, November 19, 2022 7:37 AM > > json-schema patterns by default will match anywhere in a string, so > typically we want at least the start or end anchored. Fix the obvious > cases where the anchors were forgotten. > > Signed-off-by: Rob Herring <robh@kernel.org> > --- > .../devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 2 +- > Documentation/devicetree/bindings/hwmon/adt7475.yaml | 4 ++-- > .../bindings/opp/allwinner,sun50i-h6-operating-points.yaml | 4 ++-- > .../devicetree/bindings/pci/mediatek,mt7621-pcie.yaml | 2 +- > .../devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml | 2 +- Thank you for the patch! For R-Car PCI, Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Best regards, Yoshihiro Shimoda
On 18-11-22, 16:37, Rob Herring wrote: > json-schema patterns by default will match anywhere in a string, so > typically we want at least the start or end anchored. Fix the obvious > cases where the anchors were forgotten. > > Signed-off-by: Rob Herring <robh@kernel.org> > --- > .../devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 2 +- > Documentation/devicetree/bindings/hwmon/adt7475.yaml | 4 ++-- > .../bindings/opp/allwinner,sun50i-h6-operating-points.yaml | 4 ++-- > .../devicetree/bindings/pci/mediatek,mt7621-pcie.yaml | 2 +- > .../devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml | 2 +- > Documentation/devicetree/bindings/regulator/max8660.yaml | 2 +- > .../devicetree/bindings/regulator/maxim,max77802.yaml | 2 +- > Documentation/devicetree/bindings/regulator/regulator.yaml | 2 +- > .../devicetree/bindings/regulator/rohm,bd9576-regulator.yaml | 2 +- > Documentation/devicetree/bindings/sound/renesas,rsnd.yaml | 2 +- > .../devicetree/bindings/spi/nvidia,tegra210-quad.yaml | 2 +- > 11 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml b/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml > index a11e1b867379..3c00ad09eeaa 100644 > --- a/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml > +++ b/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml > @@ -38,7 +38,7 @@ properties: > type: object > > patternProperties: > - 'cpu@[0-9a-f]+': > + '^cpu@[0-9a-f]+$': > type: object > > properties: > diff --git a/Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml b/Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml > index 385b0692261c..51f62c3ae194 100644 > --- a/Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml > +++ b/Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml > @@ -41,7 +41,7 @@ required: > - nvmem-cells > > patternProperties: > - "opp-[0-9]+": > + "^opp-[0-9]+$": > type: object > > properties: > @@ -49,7 +49,7 @@ patternProperties: > clock-latency-ns: true > > patternProperties: > - "opp-microvolt-.*": true > + "^opp-microvolt-speed[0-9]$": true > > required: > - opp-hz Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
On Fri, Nov 18, 2022 at 11:43 PM Rob Herring <robh@kernel.org> wrote: > json-schema patterns by default will match anywhere in a string, so > typically we want at least the start or end anchored. Fix the obvious > cases where the anchors were forgotten. > > Signed-off-by: Rob Herring <robh@kernel.org> > .../devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml | 2 +- > Documentation/devicetree/bindings/sound/renesas,rsnd.yaml | 2 +- Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On 11/19/22 00:37, Rob Herring wrote: > json-schema patterns by default will match anywhere in a string, so > typically we want at least the start or end anchored. Fix the obvious > cases where the anchors were forgotten. > > Signed-off-by: Rob Herring <robh@kernel.org> > --- > .../devicetree/bindings/regulator/rohm,bd9576-regulator.yaml | 2 +- Acked-by: Matti Vaittinen <mazziesaccount@gmail.com>
diff --git a/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml b/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml index a11e1b867379..3c00ad09eeaa 100644 --- a/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml +++ b/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml @@ -38,7 +38,7 @@ properties: type: object patternProperties: - 'cpu@[0-9a-f]+': + '^cpu@[0-9a-f]+$': type: object properties: diff --git a/Documentation/devicetree/bindings/hwmon/adt7475.yaml b/Documentation/devicetree/bindings/hwmon/adt7475.yaml index ea595102a86e..051c976ab711 100644 --- a/Documentation/devicetree/bindings/hwmon/adt7475.yaml +++ b/Documentation/devicetree/bindings/hwmon/adt7475.yaml @@ -61,7 +61,7 @@ patternProperties: $ref: /schemas/types.yaml#/definitions/uint32 enum: [0, 1] - "adi,pin(5|10)-function": + "^adi,pin(5|10)-function$": description: | Configures the function for pin 5 on the adi,adt7473 and adi,adt7475. Or pin 10 on the adi,adt7476 and adi,adt7490. @@ -70,7 +70,7 @@ patternProperties: - pwm2 - smbalert# - "adi,pin(9|14)-function": + "^adi,pin(9|14)-function$": description: | Configures the function for pin 9 on the adi,adt7473 and adi,adt7475. Or pin 14 on the adi,adt7476 and adi,adt7490 diff --git a/Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml b/Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml index 385b0692261c..51f62c3ae194 100644 --- a/Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml +++ b/Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml @@ -41,7 +41,7 @@ required: - nvmem-cells patternProperties: - "opp-[0-9]+": + "^opp-[0-9]+$": type: object properties: @@ -49,7 +49,7 @@ patternProperties: clock-latency-ns: true patternProperties: - "opp-microvolt-.*": true + "^opp-microvolt-speed[0-9]$": true required: - opp-hz diff --git a/Documentation/devicetree/bindings/pci/mediatek,mt7621-pcie.yaml b/Documentation/devicetree/bindings/pci/mediatek,mt7621-pcie.yaml index d60f43fd9c5a..e63e6458cea8 100644 --- a/Documentation/devicetree/bindings/pci/mediatek,mt7621-pcie.yaml +++ b/Documentation/devicetree/bindings/pci/mediatek,mt7621-pcie.yaml @@ -31,7 +31,7 @@ properties: maxItems: 2 patternProperties: - 'pcie@[0-2],0': + '^pcie@[0-2],0$': type: object $ref: /schemas/pci/pci-bus.yaml# diff --git a/Documentation/devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml b/Documentation/devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml index 0f18cceba3d5..5a0d64d3ae6b 100644 --- a/Documentation/devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml +++ b/Documentation/devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml @@ -65,7 +65,7 @@ properties: maxItems: 1 patternProperties: - 'usb@[0-1],0': + '^usb@[0-1],0$': type: object description: diff --git a/Documentation/devicetree/bindings/regulator/max8660.yaml b/Documentation/devicetree/bindings/regulator/max8660.yaml index 9c038698f880..4d550ca396eb 100644 --- a/Documentation/devicetree/bindings/regulator/max8660.yaml +++ b/Documentation/devicetree/bindings/regulator/max8660.yaml @@ -24,7 +24,7 @@ properties: type: object patternProperties: - "regulator-.+": + "^regulator-.+$": $ref: "regulator.yaml#" additionalProperties: false diff --git a/Documentation/devicetree/bindings/regulator/maxim,max77802.yaml b/Documentation/devicetree/bindings/regulator/maxim,max77802.yaml index 71138c611b6c..b704f05ea454 100644 --- a/Documentation/devicetree/bindings/regulator/maxim,max77802.yaml +++ b/Documentation/devicetree/bindings/regulator/maxim,max77802.yaml @@ -77,7 +77,7 @@ patternProperties: regulator-initial-mode: false patternProperties: - regulator-state-(standby|mem|disk): + "^regulator-state-(standby|mem|disk)$": type: object additionalProperties: true properties: diff --git a/Documentation/devicetree/bindings/regulator/regulator.yaml b/Documentation/devicetree/bindings/regulator/regulator.yaml index 6e8aa9eed3aa..53b81d8a2d41 100644 --- a/Documentation/devicetree/bindings/regulator/regulator.yaml +++ b/Documentation/devicetree/bindings/regulator/regulator.yaml @@ -231,7 +231,7 @@ patternProperties: ".*-supply$": description: Input supply phandle(s) for this node - regulator-state-(standby|mem|disk): + "^regulator-state-(standby|mem|disk)$": type: object description: sub-nodes for regulator state in Standby, Suspend-to-RAM, and diff --git a/Documentation/devicetree/bindings/regulator/rohm,bd9576-regulator.yaml b/Documentation/devicetree/bindings/regulator/rohm,bd9576-regulator.yaml index 7cb74cc8c5d9..54be194bb244 100644 --- a/Documentation/devicetree/bindings/regulator/rohm,bd9576-regulator.yaml +++ b/Documentation/devicetree/bindings/regulator/rohm,bd9576-regulator.yaml @@ -21,7 +21,7 @@ description: | regulator-voutl1, regulator-vouts1 patternProperties: - "regulator-.+": + "^regulator-.+$": type: object description: Properties for single regulator. diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml index 679a246dd666..7df40c38e865 100644 --- a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml @@ -115,7 +115,7 @@ properties: ports: $ref: /schemas/graph.yaml#/properties/ports patternProperties: - port(@[0-9a-f]+)?: + '^port(@[0-9a-f]+)?$': $ref: audio-graph-port.yaml# unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml b/Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml index 6b733e5c1163..899100e783c9 100644 --- a/Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml +++ b/Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml @@ -48,7 +48,7 @@ properties: - const: tx patternProperties: - "@[0-9a-f]+": + "@[0-9a-f]+$": type: object properties:
json-schema patterns by default will match anywhere in a string, so typically we want at least the start or end anchored. Fix the obvious cases where the anchors were forgotten. Signed-off-by: Rob Herring <robh@kernel.org> --- .../devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 2 +- Documentation/devicetree/bindings/hwmon/adt7475.yaml | 4 ++-- .../bindings/opp/allwinner,sun50i-h6-operating-points.yaml | 4 ++-- .../devicetree/bindings/pci/mediatek,mt7621-pcie.yaml | 2 +- .../devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml | 2 +- Documentation/devicetree/bindings/regulator/max8660.yaml | 2 +- .../devicetree/bindings/regulator/maxim,max77802.yaml | 2 +- Documentation/devicetree/bindings/regulator/regulator.yaml | 2 +- .../devicetree/bindings/regulator/rohm,bd9576-regulator.yaml | 2 +- Documentation/devicetree/bindings/sound/renesas,rsnd.yaml | 2 +- .../devicetree/bindings/spi/nvidia,tegra210-quad.yaml | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-)