| Message ID | 20210202205544.24812-1-robh@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] dt-bindings: Fix undocumented compatible strings in examples | expand |
On 2/2/21 12:55 PM, Rob Herring wrote: > Running 'dt-validate -m' will flag any compatible strings missing a schema. > Fix all the errors found in DT binding examples. Most of these are just > typos. > > Cc: Stephen Boyd <sboyd@kernel.org> > Cc: Maxime Ripard <mripard@kernel.org> > Cc: Chen-Yu Tsai <wens@csie.org> > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Herbert Xu <herbert@gondor.apana.org.au> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: Daniel Palmer <daniel@thingy.jp> > Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com> > Cc: Avi Fishman <avifishman70@gmail.com> > Cc: Tomer Maimon <tmaimon77@gmail.com> > Cc: Tali Perry <tali.perry1@gmail.com> > Cc: Joerg Roedel <joro@8bytes.org> > Cc: Will Deacon <will@kernel.org> > Cc: Andrew Jeffery <andrew@aj.id.au> > Cc: Joel Stanley <joel@jms.id.au> > Cc: Wim Van Sebroeck <wim@linux-watchdog.org> > Cc: Guenter Roeck <linux@roeck-us.net> > Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> > Cc: Vincent Cheng <vincent.cheng.xh@renesas.com> > Cc: linux-clk@vger.kernel.org > Cc: linux-crypto@vger.kernel.org > Cc: linux-gpio@vger.kernel.org > Cc: linux-i2c@vger.kernel.org > Cc: iommu@lists.linux-foundation.org > Cc: linux-watchdog@vger.kernel.org Reviewed-by: Guenter Roeck <linux@roeck-us.net> > Signed-off-by: Rob Herring <robh@kernel.org> > --- > .../bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml | 2 +- > Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml | 4 ++-- > Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml | 2 +- > Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml | 2 +- > .../devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml | 2 +- > .../devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml | 2 +- > .../devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 2 +- > .../devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 2 +- > .../devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 2 +- > Documentation/devicetree/bindings/ptp/ptp-idtcm.yaml | 4 +--- > Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml | 4 ++-- > 11 files changed, 13 insertions(+), 15 deletions(-) > > diff --git a/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml b/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml > index fa0ee03a527f..53cc6df0df96 100644 > --- a/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml > +++ b/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml > @@ -18,7 +18,7 @@ properties: > const: 1 > > compatible: > - const: allwinner,sun9i-a80-usb-clocks > + const: allwinner,sun9i-a80-usb-clks > > reg: > maxItems: 1 > diff --git a/Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml b/Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml > index eb241587efd1..118c5543e037 100644 > --- a/Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml > +++ b/Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml > @@ -66,8 +66,8 @@ properties: > - arm,syscon-icst525-integratorcp-cm-mem > - arm,integrator-cm-auxosc > - arm,versatile-cm-auxosc > - - arm,impd-vco1 > - - arm,impd-vco2 > + - arm,impd1-vco1 > + - arm,impd1-vco2 > > clocks: > description: Parent clock for the ICST VCO > diff --git a/Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml b/Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml > index 1465c9ebaf93..1d48ac712b23 100644 > --- a/Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml > +++ b/Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml > @@ -66,7 +66,7 @@ examples: > #include <dt-bindings/soc/ti,sci_pm_domain.h> > > main_crypto: crypto@4e00000 { > - compatible = "ti,j721-sa2ul"; > + compatible = "ti,j721e-sa2ul"; > reg = <0x4e00000 0x1200>; > power-domains = <&k3_pds 264 TI_SCI_PD_EXCLUSIVE>; > dmas = <&main_udmap 0xc000>, <&main_udmap 0x4000>, > diff --git a/Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml b/Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml > index 1f2ef408bb43..fe1e1c63ffe3 100644 > --- a/Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml > +++ b/Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml > @@ -46,7 +46,7 @@ examples: > #include <dt-bindings/gpio/msc313-gpio.h> > > gpio: gpio@207800 { > - compatible = "mstar,msc313e-gpio"; > + compatible = "mstar,msc313-gpio"; > #gpio-cells = <2>; > reg = <0x207800 0x200>; > gpio-controller; > diff --git a/Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml b/Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml > index e3ef2d36f372..128444942aec 100644 > --- a/Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml > +++ b/Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml > @@ -17,7 +17,7 @@ maintainers: > > properties: > compatible: > - const: nuvoton,npcm7xx-i2c > + const: nuvoton,npcm750-i2c > > reg: > maxItems: 1 > diff --git a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml > index cde1afa8dfd6..349633108bbd 100644 > --- a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml > +++ b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml > @@ -93,7 +93,7 @@ examples: > #include <dt-bindings/power/r8a7791-sysc.h> > > ipmmu_mx: iommu@fe951000 { > - compatible = "renasas,ipmmu-r8a7791", "renasas,ipmmu-vmsa"; > + compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa"; > reg = <0xfe951000 0x1000>; > interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>, > <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>; > diff --git a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml > index 54631dc1adb0..5dbb84049ff6 100644 > --- a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml > +++ b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml > @@ -63,7 +63,7 @@ examples: > reg = <0x1e6e2000 0x1a8>; > > pinctrl: pinctrl { > - compatible = "aspeed,g4-pinctrl"; > + compatible = "aspeed,ast2400-pinctrl"; > > pinctrl_i2c3_default: i2c3_default { > function = "I2C3"; > diff --git a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml > index a90c0fe0495f..ad1c33364b38 100644 > --- a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml > +++ b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml > @@ -81,7 +81,7 @@ examples: > reg = <0x1e6e2000 0x1a8>; > > pinctrl: pinctrl { > - compatible = "aspeed,g5-pinctrl"; > + compatible = "aspeed,ast2500-pinctrl"; > aspeed,external-nodes = <&gfx>, <&lhc>; > > pinctrl_i2c3_default: i2c3_default { > diff --git a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml > index c78ab7e2eee7..ad91c0bc54da 100644 > --- a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml > +++ b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml > @@ -95,7 +95,7 @@ examples: > reg = <0x1e6e2000 0xf6c>; > > pinctrl: pinctrl { > - compatible = "aspeed,g6-pinctrl"; > + compatible = "aspeed,ast2600-pinctrl"; > > pinctrl_pwm10g1_default: pwm10g1_default { > function = "PWM10"; > diff --git a/Documentation/devicetree/bindings/ptp/ptp-idtcm.yaml b/Documentation/devicetree/bindings/ptp/ptp-idtcm.yaml > index 239b49fad805..658cec67743e 100644 > --- a/Documentation/devicetree/bindings/ptp/ptp-idtcm.yaml > +++ b/Documentation/devicetree/bindings/ptp/ptp-idtcm.yaml > @@ -59,9 +59,7 @@ additionalProperties: false > > examples: > - | > - i2c@1 { > - compatible = "abc,acme-1234"; > - reg = <0x01 0x400>; > + i2c { > #address-cells = <1>; > #size-cells = <0>; > phc@5b { > diff --git a/Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml b/Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml > index c1348db59374..054584d7543a 100644 > --- a/Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml > +++ b/Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml > @@ -57,8 +57,8 @@ examples: > */ > #include <dt-bindings/soc/ti,sci_pm_domain.h> > > - watchdog0: rti@2200000 { > - compatible = "ti,rti-wdt"; > + watchdog@2200000 { > + compatible = "ti,j7-rti-wdt"; > reg = <0x2200000 0x100>; > clocks = <&k3_clks 252 1>; > power-domains = <&k3_pds 252 TI_SCI_PD_EXCLUSIVE>; >
On Wed, 3 Feb 2021, at 07:25, Rob Herring wrote: > Running 'dt-validate -m' will flag any compatible strings missing a schema. > Fix all the errors found in DT binding examples. Most of these are just > typos. > > Cc: Stephen Boyd <sboyd@kernel.org> > Cc: Maxime Ripard <mripard@kernel.org> > Cc: Chen-Yu Tsai <wens@csie.org> > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Herbert Xu <herbert@gondor.apana.org.au> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: Daniel Palmer <daniel@thingy.jp> > Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com> > Cc: Avi Fishman <avifishman70@gmail.com> > Cc: Tomer Maimon <tmaimon77@gmail.com> > Cc: Tali Perry <tali.perry1@gmail.com> > Cc: Joerg Roedel <joro@8bytes.org> > Cc: Will Deacon <will@kernel.org> > Cc: Andrew Jeffery <andrew@aj.id.au> > Cc: Joel Stanley <joel@jms.id.au> > Cc: Wim Van Sebroeck <wim@linux-watchdog.org> > Cc: Guenter Roeck <linux@roeck-us.net> > Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> > Cc: Vincent Cheng <vincent.cheng.xh@renesas.com> > Cc: linux-clk@vger.kernel.org > Cc: linux-crypto@vger.kernel.org > Cc: linux-gpio@vger.kernel.org > Cc: linux-i2c@vger.kernel.org > Cc: iommu@lists.linux-foundation.org > Cc: linux-watchdog@vger.kernel.org > Signed-off-by: Rob Herring <robh@kernel.org> > --- > .../bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml | 2 +- > Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml | 4 ++-- > Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml | 2 +- > Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml | 2 +- > .../devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml | 2 +- > .../devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml | 2 +- > .../devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 2 +- > .../devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 2 +- > .../devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 2 +- > Documentation/devicetree/bindings/ptp/ptp-idtcm.yaml | 4 +--- > Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml | 4 ++-- > 11 files changed, 13 insertions(+), 15 deletions(-) > > diff --git > a/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml b/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml > index fa0ee03a527f..53cc6df0df96 100644 > --- > a/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml > +++ > b/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml > @@ -18,7 +18,7 @@ properties: > const: 1 > > compatible: > - const: allwinner,sun9i-a80-usb-clocks > + const: allwinner,sun9i-a80-usb-clks > > reg: > maxItems: 1 > diff --git > a/Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml > b/Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml > index eb241587efd1..118c5543e037 100644 > --- a/Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml > +++ b/Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml > @@ -66,8 +66,8 @@ properties: > - arm,syscon-icst525-integratorcp-cm-mem > - arm,integrator-cm-auxosc > - arm,versatile-cm-auxosc > - - arm,impd-vco1 > - - arm,impd-vco2 > + - arm,impd1-vco1 > + - arm,impd1-vco2 > > clocks: > description: Parent clock for the ICST VCO > diff --git a/Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml > b/Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml > index 1465c9ebaf93..1d48ac712b23 100644 > --- a/Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml > +++ b/Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml > @@ -66,7 +66,7 @@ examples: > #include <dt-bindings/soc/ti,sci_pm_domain.h> > > main_crypto: crypto@4e00000 { > - compatible = "ti,j721-sa2ul"; > + compatible = "ti,j721e-sa2ul"; > reg = <0x4e00000 0x1200>; > power-domains = <&k3_pds 264 TI_SCI_PD_EXCLUSIVE>; > dmas = <&main_udmap 0xc000>, <&main_udmap 0x4000>, > diff --git > a/Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml > b/Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml > index 1f2ef408bb43..fe1e1c63ffe3 100644 > --- a/Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml > +++ b/Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml > @@ -46,7 +46,7 @@ examples: > #include <dt-bindings/gpio/msc313-gpio.h> > > gpio: gpio@207800 { > - compatible = "mstar,msc313e-gpio"; > + compatible = "mstar,msc313-gpio"; > #gpio-cells = <2>; > reg = <0x207800 0x200>; > gpio-controller; > diff --git > a/Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml > b/Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml > index e3ef2d36f372..128444942aec 100644 > --- a/Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml > +++ b/Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml > @@ -17,7 +17,7 @@ maintainers: > > properties: > compatible: > - const: nuvoton,npcm7xx-i2c > + const: nuvoton,npcm750-i2c > > reg: > maxItems: 1 > diff --git > a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml > b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml > index cde1afa8dfd6..349633108bbd 100644 > --- a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml > +++ b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml > @@ -93,7 +93,7 @@ examples: > #include <dt-bindings/power/r8a7791-sysc.h> > > ipmmu_mx: iommu@fe951000 { > - compatible = "renasas,ipmmu-r8a7791", "renasas,ipmmu-vmsa"; > + compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa"; > reg = <0xfe951000 0x1000>; > interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>, > <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>; > diff --git > a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml > b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml > index 54631dc1adb0..5dbb84049ff6 100644 > --- > a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml > +++ > b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml > @@ -63,7 +63,7 @@ examples: > reg = <0x1e6e2000 0x1a8>; > > pinctrl: pinctrl { > - compatible = "aspeed,g4-pinctrl"; > + compatible = "aspeed,ast2400-pinctrl"; > > pinctrl_i2c3_default: i2c3_default { > function = "I2C3"; > diff --git > a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml > b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml > index a90c0fe0495f..ad1c33364b38 100644 > --- > a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml > +++ > b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml > @@ -81,7 +81,7 @@ examples: > reg = <0x1e6e2000 0x1a8>; > > pinctrl: pinctrl { > - compatible = "aspeed,g5-pinctrl"; > + compatible = "aspeed,ast2500-pinctrl"; > aspeed,external-nodes = <&gfx>, <&lhc>; > > pinctrl_i2c3_default: i2c3_default { > diff --git > a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml > b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml > index c78ab7e2eee7..ad91c0bc54da 100644 > --- > a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml > +++ > b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml > @@ -95,7 +95,7 @@ examples: > reg = <0x1e6e2000 0xf6c>; > > pinctrl: pinctrl { > - compatible = "aspeed,g6-pinctrl"; > + compatible = "aspeed,ast2600-pinctrl"; Ah, thanks. For the Aspeed changes: Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
On Tue, Feb 02, 2021 at 04:33:56PM -0800, Stephen Boyd wrote: > Quoting Rob Herring (2021-02-02 12:55:42) > > > > diff --git a/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml b/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml > > index fa0ee03a527f..53cc6df0df96 100644 > > --- a/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml > > +++ b/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml > > @@ -18,7 +18,7 @@ properties: > > const: 1 > > > > compatible: > > - const: allwinner,sun9i-a80-usb-clocks > > + const: allwinner,sun9i-a80-usb-clks > > Should the file name change too? Ideally yes, and with that change Acked-by: Maxime Ripard <mripard@kernel.org> Maxime
On Tue, Feb 2, 2021 at 9:55 PM Rob Herring <robh@kernel.org> wrote: > Running 'dt-validate -m' will flag any compatible strings missing a schema. > Fix all the errors found in DT binding examples. Most of these are just > typos. > > Cc: Stephen Boyd <sboyd@kernel.org> > Cc: Maxime Ripard <mripard@kernel.org> > Cc: Chen-Yu Tsai <wens@csie.org> > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Herbert Xu <herbert@gondor.apana.org.au> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: Daniel Palmer <daniel@thingy.jp> > Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com> > Cc: Avi Fishman <avifishman70@gmail.com> > Cc: Tomer Maimon <tmaimon77@gmail.com> > Cc: Tali Perry <tali.perry1@gmail.com> > Cc: Joerg Roedel <joro@8bytes.org> > Cc: Will Deacon <will@kernel.org> > Cc: Andrew Jeffery <andrew@aj.id.au> > Cc: Joel Stanley <joel@jms.id.au> > Cc: Wim Van Sebroeck <wim@linux-watchdog.org> > Cc: Guenter Roeck <linux@roeck-us.net> > Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> > Cc: Vincent Cheng <vincent.cheng.xh@renesas.com> > Cc: linux-clk@vger.kernel.org > Cc: linux-crypto@vger.kernel.org > Cc: linux-gpio@vger.kernel.org > Cc: linux-i2c@vger.kernel.org > Cc: iommu@lists.linux-foundation.org > Cc: linux-watchdog@vger.kernel.org > Signed-off-by: Rob Herring <robh@kernel.org> Ooops. Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On 02-02-21, 14:55, Rob Herring wrote: > Properties in if/then schemas weren't getting checked by the meta-schemas. > Enabling meta-schema checks finds several errors. > > The use of an 'items' schema (as opposed to the list form) is wrong in > some cases as it applies to all entries. 'contains' is the correct schema > to use in the case of multiple entries. > > Cc: Herbert Xu <herbert@gondor.apana.org.au> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: Maxime Ripard <mripard@kernel.org> > Cc: Chen-Yu Tsai <wens@csie.org> > Cc: Eric Anholt <eric@anholt.net> > Cc: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> > Cc: Florian Fainelli <f.fainelli@gmail.com> > Cc: Ray Jui <rjui@broadcom.com> > Cc: Scott Branden <sbranden@broadcom.com> > Cc: Pavel Machek <pavel@ucw.cz> > Cc: Ulf Hansson <ulf.hansson@linaro.org> > Cc: Kishon Vijay Abraham I <kishon@ti.com> > Cc: Vinod Koul <vkoul@kernel.org> > Cc: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > Cc: linux-crypto@vger.kernel.org > Cc: dri-devel@lists.freedesktop.org > Cc: linux-leds@vger.kernel.org > Cc: linux-mmc@vger.kernel.org > Cc: linux-gpio@vger.kernel.org > Signed-off-by: Rob Herring <robh@kernel.org> > --- > .../devicetree/bindings/crypto/allwinner,sun8i-ce.yaml | 3 +-- > .../devicetree/bindings/display/brcm,bcm2835-hvs.yaml | 2 +- > Documentation/devicetree/bindings/leds/ti,tca6507.yaml | 1 + > Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml | 2 +- > Documentation/devicetree/bindings/phy/brcm,sata-phy.yaml | 3 +-- > .../devicetree/bindings/phy/renesas,usb2-phy.yaml | 5 ++--- For phy: Acked-By: Vinod Koul <vkoul@kernel.org>
Hi Rob, On Wed, Feb 3, 2021 at 4:55 PM Rob Herring <robh@kernel.org> wrote: > On Wed, Feb 03, 2021 at 09:01:23AM +0100, Geert Uytterhoeven wrote: > > On Tue, Feb 2, 2021 at 9:55 PM Rob Herring <robh@kernel.org> wrote: > > > Properties in if/then schemas weren't getting checked by the meta-schemas. > > > Enabling meta-schema checks finds several errors. > > > > > > The use of an 'items' schema (as opposed to the list form) is wrong in > > > some cases as it applies to all entries. 'contains' is the correct schema > > > to use in the case of multiple entries. > > > > > Signed-off-by: Rob Herring <robh@kernel.org> > > > > Thanks for your patch! > > > > > --- a/Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml > > > +++ b/Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml > > > @@ -81,9 +81,8 @@ properties: > > > if: > > > properties: > > > compatible: > > > - items: > > > - enum: > > > - - renesas,usb2-phy-r7s9210 > > > + contains: > > > + const: renesas,usb2-phy-r7s9210 > > > > Single entry, so "contains" not needed? > > No, you are misunderstanding how these work. 'contains' means at least > one entry in an array passes with the subschema. In this case, > 'renesas,usb2-phy-r7s9210' must appear somewhere in the 'compatible' > values. (Before, it said *every* entry must be > 'renesas,usb2-phy-r7s9210'.) As there is a fallback compatible, we need > 'contains'. > > > > --- a/Documentation/devicetree/bindings/pinctrl/renesas,pfc.yaml > > > +++ b/Documentation/devicetree/bindings/pinctrl/renesas,pfc.yaml > > > @@ -76,11 +76,10 @@ required: > > > if: > > > properties: > > > compatible: > > > - items: > > > - enum: > > > - - renesas,pfc-r8a73a4 > > > - - renesas,pfc-r8a7740 > > > - - renesas,pfc-sh73a0 > > > + enum: > > > + - renesas,pfc-r8a73a4 > > > + - renesas,pfc-r8a7740 > > > + - renesas,pfc-sh73a0 > > > > Missing "contains"? > > No. In this case, 'compatible' is always a single entry, so no > 'contains' needed (but would work). If compatible is one of these 3 > strings, then the 'if' is true. > > The original way would actually work in this case (i.e. is valid > json-schema), but we require 'items' to have a size (maxItems/minItems) > in our meta-schema. Thanks for the explanation! Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert
On Tue, Feb 02, 2021 at 04:33:56PM -0800, Stephen Boyd wrote: > Quoting Rob Herring (2021-02-02 12:55:42) > > > > diff --git a/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml b/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml > > index fa0ee03a527f..53cc6df0df96 100644 > > --- a/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml > > +++ b/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml > > @@ -18,7 +18,7 @@ properties: > > const: 1 > > > > compatible: > > - const: allwinner,sun9i-a80-usb-clocks > > + const: allwinner,sun9i-a80-usb-clks > > Should the file name change too? Yes, I'll fix that while applying. Rob
Hi Rob, > From: Rob Herring, Sent: Wednesday, February 3, 2021 5:56 AM > > Running 'dt-validate -m' will flag any compatible strings missing a schema. > Fix all the errors found in DT binding examples. Most of these are just > typos. > > Cc: Stephen Boyd <sboyd@kernel.org> > Cc: Maxime Ripard <mripard@kernel.org> > Cc: Chen-Yu Tsai <wens@csie.org> > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Herbert Xu <herbert@gondor.apana.org.au> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: Daniel Palmer <daniel@thingy.jp> > Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com> > Cc: Avi Fishman <avifishman70@gmail.com> > Cc: Tomer Maimon <tmaimon77@gmail.com> > Cc: Tali Perry <tali.perry1@gmail.com> > Cc: Joerg Roedel <joro@8bytes.org> > Cc: Will Deacon <will@kernel.org> > Cc: Andrew Jeffery <andrew@aj.id.au> > Cc: Joel Stanley <joel@jms.id.au> > Cc: Wim Van Sebroeck <wim@linux-watchdog.org> > Cc: Guenter Roeck <linux@roeck-us.net> > Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> > Cc: Vincent Cheng <vincent.cheng.xh@renesas.com> > Cc: linux-clk@vger.kernel.org > Cc: linux-crypto@vger.kernel.org > Cc: linux-gpio@vger.kernel.org > Cc: linux-i2c@vger.kernel.org > Cc: iommu@lists.linux-foundation.org > Cc: linux-watchdog@vger.kernel.org > Signed-off-by: Rob Herring <robh@kernel.org> <snip> > diff --git a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml > b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml > index cde1afa8dfd6..349633108bbd 100644 > --- a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml > +++ b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml > @@ -93,7 +93,7 @@ examples: > #include <dt-bindings/power/r8a7791-sysc.h> > > ipmmu_mx: iommu@fe951000 { > - compatible = "renasas,ipmmu-r8a7791", "renasas,ipmmu-vmsa"; > + compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa"; Oops. Thank you for fixing this. Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Best regards, Yoshihiro Shimoda
On Tue, Feb 02, 2021 at 02:55:42PM -0600, Rob Herring wrote: > Running 'dt-validate -m' will flag any compatible strings missing a schema. > Fix all the errors found in DT binding examples. Most of these are just > typos. > > Cc: Stephen Boyd <sboyd@kernel.org> > Cc: Maxime Ripard <mripard@kernel.org> > Cc: Chen-Yu Tsai <wens@csie.org> > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Herbert Xu <herbert@gondor.apana.org.au> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: Daniel Palmer <daniel@thingy.jp> > Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com> > Cc: Avi Fishman <avifishman70@gmail.com> > Cc: Tomer Maimon <tmaimon77@gmail.com> > Cc: Tali Perry <tali.perry1@gmail.com> > Cc: Joerg Roedel <joro@8bytes.org> > Cc: Will Deacon <will@kernel.org> > Cc: Andrew Jeffery <andrew@aj.id.au> > Cc: Joel Stanley <joel@jms.id.au> > Cc: Wim Van Sebroeck <wim@linux-watchdog.org> > Cc: Guenter Roeck <linux@roeck-us.net> > Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> > Cc: Vincent Cheng <vincent.cheng.xh@renesas.com> > Cc: linux-clk@vger.kernel.org > Cc: linux-crypto@vger.kernel.org > Cc: linux-gpio@vger.kernel.org > Cc: linux-i2c@vger.kernel.org > Cc: iommu@lists.linux-foundation.org > Cc: linux-watchdog@vger.kernel.org > Signed-off-by: Rob Herring <robh@kernel.org> Acked-by: Wolfram Sang <wsa@kernel.org> # for I2C
diff --git a/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml b/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml index fa0ee03a527f..53cc6df0df96 100644 --- a/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml +++ b/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml @@ -18,7 +18,7 @@ properties: const: 1 compatible: - const: allwinner,sun9i-a80-usb-clocks + const: allwinner,sun9i-a80-usb-clks reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml b/Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml index eb241587efd1..118c5543e037 100644 --- a/Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml +++ b/Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml @@ -66,8 +66,8 @@ properties: - arm,syscon-icst525-integratorcp-cm-mem - arm,integrator-cm-auxosc - arm,versatile-cm-auxosc - - arm,impd-vco1 - - arm,impd-vco2 + - arm,impd1-vco1 + - arm,impd1-vco2 clocks: description: Parent clock for the ICST VCO diff --git a/Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml b/Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml index 1465c9ebaf93..1d48ac712b23 100644 --- a/Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml +++ b/Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml @@ -66,7 +66,7 @@ examples: #include <dt-bindings/soc/ti,sci_pm_domain.h> main_crypto: crypto@4e00000 { - compatible = "ti,j721-sa2ul"; + compatible = "ti,j721e-sa2ul"; reg = <0x4e00000 0x1200>; power-domains = <&k3_pds 264 TI_SCI_PD_EXCLUSIVE>; dmas = <&main_udmap 0xc000>, <&main_udmap 0x4000>, diff --git a/Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml b/Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml index 1f2ef408bb43..fe1e1c63ffe3 100644 --- a/Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml +++ b/Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml @@ -46,7 +46,7 @@ examples: #include <dt-bindings/gpio/msc313-gpio.h> gpio: gpio@207800 { - compatible = "mstar,msc313e-gpio"; + compatible = "mstar,msc313-gpio"; #gpio-cells = <2>; reg = <0x207800 0x200>; gpio-controller; diff --git a/Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml b/Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml index e3ef2d36f372..128444942aec 100644 --- a/Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml +++ b/Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml @@ -17,7 +17,7 @@ maintainers: properties: compatible: - const: nuvoton,npcm7xx-i2c + const: nuvoton,npcm750-i2c reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml index cde1afa8dfd6..349633108bbd 100644 --- a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml +++ b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml @@ -93,7 +93,7 @@ examples: #include <dt-bindings/power/r8a7791-sysc.h> ipmmu_mx: iommu@fe951000 { - compatible = "renasas,ipmmu-r8a7791", "renasas,ipmmu-vmsa"; + compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa"; reg = <0xfe951000 0x1000>; interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>; diff --git a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml index 54631dc1adb0..5dbb84049ff6 100644 --- a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml +++ b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml @@ -63,7 +63,7 @@ examples: reg = <0x1e6e2000 0x1a8>; pinctrl: pinctrl { - compatible = "aspeed,g4-pinctrl"; + compatible = "aspeed,ast2400-pinctrl"; pinctrl_i2c3_default: i2c3_default { function = "I2C3"; diff --git a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml index a90c0fe0495f..ad1c33364b38 100644 --- a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml +++ b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml @@ -81,7 +81,7 @@ examples: reg = <0x1e6e2000 0x1a8>; pinctrl: pinctrl { - compatible = "aspeed,g5-pinctrl"; + compatible = "aspeed,ast2500-pinctrl"; aspeed,external-nodes = <&gfx>, <&lhc>; pinctrl_i2c3_default: i2c3_default { diff --git a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml index c78ab7e2eee7..ad91c0bc54da 100644 --- a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml +++ b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml @@ -95,7 +95,7 @@ examples: reg = <0x1e6e2000 0xf6c>; pinctrl: pinctrl { - compatible = "aspeed,g6-pinctrl"; + compatible = "aspeed,ast2600-pinctrl"; pinctrl_pwm10g1_default: pwm10g1_default { function = "PWM10"; diff --git a/Documentation/devicetree/bindings/ptp/ptp-idtcm.yaml b/Documentation/devicetree/bindings/ptp/ptp-idtcm.yaml index 239b49fad805..658cec67743e 100644 --- a/Documentation/devicetree/bindings/ptp/ptp-idtcm.yaml +++ b/Documentation/devicetree/bindings/ptp/ptp-idtcm.yaml @@ -59,9 +59,7 @@ additionalProperties: false examples: - | - i2c@1 { - compatible = "abc,acme-1234"; - reg = <0x01 0x400>; + i2c { #address-cells = <1>; #size-cells = <0>; phc@5b { diff --git a/Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml b/Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml index c1348db59374..054584d7543a 100644 --- a/Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml @@ -57,8 +57,8 @@ examples: */ #include <dt-bindings/soc/ti,sci_pm_domain.h> - watchdog0: rti@2200000 { - compatible = "ti,rti-wdt"; + watchdog@2200000 { + compatible = "ti,j7-rti-wdt"; reg = <0x2200000 0x100>; clocks = <&k3_clks 252 1>; power-domains = <&k3_pds 252 TI_SCI_PD_EXCLUSIVE>;
Running 'dt-validate -m' will flag any compatible strings missing a schema. Fix all the errors found in DT binding examples. Most of these are just typos. Cc: Stephen Boyd <sboyd@kernel.org> Cc: Maxime Ripard <mripard@kernel.org> Cc: Chen-Yu Tsai <wens@csie.org> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: "David S. Miller" <davem@davemloft.net> Cc: Daniel Palmer <daniel@thingy.jp> Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com> Cc: Avi Fishman <avifishman70@gmail.com> Cc: Tomer Maimon <tmaimon77@gmail.com> Cc: Tali Perry <tali.perry1@gmail.com> Cc: Joerg Roedel <joro@8bytes.org> Cc: Will Deacon <will@kernel.org> Cc: Andrew Jeffery <andrew@aj.id.au> Cc: Joel Stanley <joel@jms.id.au> Cc: Wim Van Sebroeck <wim@linux-watchdog.org> Cc: Guenter Roeck <linux@roeck-us.net> Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Cc: Vincent Cheng <vincent.cheng.xh@renesas.com> Cc: linux-clk@vger.kernel.org Cc: linux-crypto@vger.kernel.org Cc: linux-gpio@vger.kernel.org Cc: linux-i2c@vger.kernel.org Cc: iommu@lists.linux-foundation.org Cc: linux-watchdog@vger.kernel.org Signed-off-by: Rob Herring <robh@kernel.org> --- .../bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml | 2 +- Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml | 4 ++-- Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml | 2 +- Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml | 2 +- .../devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml | 2 +- .../devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml | 2 +- .../devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 2 +- .../devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 2 +- .../devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 2 +- Documentation/devicetree/bindings/ptp/ptp-idtcm.yaml | 4 +--- Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml | 4 ++-- 11 files changed, 13 insertions(+), 15 deletions(-) -- 2.27.0