| Message ID | 20220915065542.13150-6-arinc.unal@arinc9.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | dt-bindings and mt7621 devicetree changes | expand |
Hi Arinc, On Thu, Sep 15, 2022 at 8:56 AM Arınç ÜNAL <arinc.unal@arinc9.com> wrote: > > Fix the dtc warnings below. > > uartlite@c00: $nodename:0: 'uartlite@c00' does not match '^serial(@.*)?$' > From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/serial/8250.yaml > uartlite@c00: Unevaluated properties are not allowed ('clock-names' was unexpected) > From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/serial/8250.yaml > sdhci@1e130000: $nodename:0: 'sdhci@1e130000' does not match '^mmc(@.*)?$' > From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/mmc/mtk-sd.yaml > sdhci@1e130000: Unevaluated properties are not allowed ('bus-width', 'cap-mmc-highspeed', 'cap-sd-highspeed', 'disable-wp', 'max-frequency', 'vmmc-supply', 'vqmmc-supply' were unexpected) > From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/mmc/mtk-sd.yaml > xhci@1e1c0000: $nodename:0: 'xhci@1e1c0000' does not match '^usb(@.*)?' > From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml > xhci@1e1c0000: compatible: ['mediatek,mt8173-xhci'] is too short > From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml > switch0@0: $nodename:0: 'switch0@0' does not match '^(ethernet-)?switch(@.*)?$' > From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml > port@1: status:0: 'off' is not one of ['okay', 'disabled', 'reserved'] > From schema: /home/arinc9/.local/lib/python3.10/site-packages/dtschema/schemas/dt-core.yaml > port@2: status:0: 'off' is not one of ['okay', 'disabled', 'reserved'] > From schema: /home/arinc9/.local/lib/python3.10/site-packages/dtschema/schemas/dt-core.yaml > port@3: status:0: 'off' is not one of ['okay', 'disabled', 'reserved'] > From schema: /home/arinc9/.local/lib/python3.10/site-packages/dtschema/schemas/dt-core.yaml > > - Change "uartlite: uartlite@c00" to "serial0: serial@c00" and remove the > aliases node. > - Remove "clock-names" from the serial0 node. The property doesn't exist on > the 8250.yaml schema. > - Change "sdhci: sdhci@1e130000" to "mmc: mmc@1e130000". > - Change "xhci: xhci@1e1c0000" to "usb: usb@1e1c0000". > - Add "mediatek,mtk-xhci" as the second compatible string on the usb node. > - Change "switch0: switch0@0" to "switch0: switch@0" > - Change "off" to "disabled" for disabled nodes. > > Remaining warnings are caused by the lack of json-schema documentation. The followings needs to be ported to yaml schema but exist in its previous txt format: > > /cpuintc: failed to match any schema with compatible: ['mti,cpu-interrupt-controller'] https://elixir.bootlin.com/linux/v6.0-rc5/source/Documentation/devicetree/bindings/mips/cpu_irq.txt#L13 > /palmbus@1e000000/wdt@100: failed to match any schema with compatible: ['mediatek,mt7621-wdt'] https://elixir.bootlin.com/linux/v6.0-rc5/source/Documentation/devicetree/bindings/watchdog/mt7621-wdt.txt#L4 > /palmbus@1e000000/i2c@900: failed to match any schema with compatible: ['mediatek,mt7621-i2c'] https://elixir.bootlin.com/linux/v6.0-rc5/source/Documentation/devicetree/bindings/i2c/i2c-mt7621.txt#L6 > /palmbus@1e000000/spi@b00: failed to match any schema with compatible: ['ralink,mt7621-spi'] https://elixir.bootlin.com/linux/v6.0-rc5/source/Documentation/devicetree/bindings/spi/spi-mt7621.txt#L5 > /ethernet@1e100000: failed to match any schema with compatible: ['mediatek,mt7621-eth'] https://elixir.bootlin.com/linux/v6.0-rc5/source/Documentation/devicetree/bindings/net/ralink,rt2880-net.txt#L15 > > Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com> > --- > .../boot/dts/ralink/mt7621-gnubee-gb-pc1.dts | 2 +- > .../boot/dts/ralink/mt7621-gnubee-gb-pc2.dts | 2 +- > arch/mips/boot/dts/ralink/mt7621.dtsi | 28 ++++++++----------- > 3 files changed, 13 insertions(+), 19 deletions(-) Reviewed-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
> On 15 Sep 2022, at 10:17, Sergio Paracuellos <sergio.paracuellos@gmail.com> wrote: > > Hi Arinc, > >> On Thu, Sep 15, 2022 at 8:56 AM Arınç ÜNAL <arinc.unal@arinc9.com> wrote: >> >> Fix the dtc warnings below. >> >> uartlite@c00: $nodename:0: 'uartlite@c00' does not match '^serial(@.*)?$' >> From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/serial/8250.yaml >> uartlite@c00: Unevaluated properties are not allowed ('clock-names' was unexpected) >> From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/serial/8250.yaml >> sdhci@1e130000: $nodename:0: 'sdhci@1e130000' does not match '^mmc(@.*)?$' >> From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/mmc/mtk-sd.yaml >> sdhci@1e130000: Unevaluated properties are not allowed ('bus-width', 'cap-mmc-highspeed', 'cap-sd-highspeed', 'disable-wp', 'max-frequency', 'vmmc-supply', 'vqmmc-supply' were unexpected) >> From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/mmc/mtk-sd.yaml >> xhci@1e1c0000: $nodename:0: 'xhci@1e1c0000' does not match '^usb(@.*)?' >> From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml >> xhci@1e1c0000: compatible: ['mediatek,mt8173-xhci'] is too short >> From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml >> switch0@0: $nodename:0: 'switch0@0' does not match '^(ethernet-)?switch(@.*)?$' >> From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml >> port@1: status:0: 'off' is not one of ['okay', 'disabled', 'reserved'] >> From schema: /home/arinc9/.local/lib/python3.10/site-packages/dtschema/schemas/dt-core.yaml >> port@2: status:0: 'off' is not one of ['okay', 'disabled', 'reserved'] >> From schema: /home/arinc9/.local/lib/python3.10/site-packages/dtschema/schemas/dt-core.yaml >> port@3: status:0: 'off' is not one of ['okay', 'disabled', 'reserved'] >> From schema: /home/arinc9/.local/lib/python3.10/site-packages/dtschema/schemas/dt-core.yaml >> >> - Change "uartlite: uartlite@c00" to "serial0: serial@c00" and remove the >> aliases node. >> - Remove "clock-names" from the serial0 node. The property doesn't exist on >> the 8250.yaml schema. >> - Change "sdhci: sdhci@1e130000" to "mmc: mmc@1e130000". >> - Change "xhci: xhci@1e1c0000" to "usb: usb@1e1c0000". >> - Add "mediatek,mtk-xhci" as the second compatible string on the usb node. >> - Change "switch0: switch0@0" to "switch0: switch@0" >> - Change "off" to "disabled" for disabled nodes. >> >> Remaining warnings are caused by the lack of json-schema documentation. > > The followings needs to be ported to yaml schema but exist in its > previous txt format: > >> >> /cpuintc: failed to match any schema with compatible: ['mti,cpu-interrupt-controller'] > > https://elixir.bootlin.com/linux/v6.0-rc5/source/Documentation/devicetree/bindings/mips/cpu_irq.txt#L13 > >> /palmbus@1e000000/wdt@100: failed to match any schema with compatible: ['mediatek,mt7621-wdt'] > > https://elixir.bootlin.com/linux/v6.0-rc5/source/Documentation/devicetree/bindings/watchdog/mt7621-wdt.txt#L4 > >> /palmbus@1e000000/i2c@900: failed to match any schema with compatible: ['mediatek,mt7621-i2c'] > > https://elixir.bootlin.com/linux/v6.0-rc5/source/Documentation/devicetree/bindings/i2c/i2c-mt7621.txt#L6 > >> /palmbus@1e000000/spi@b00: failed to match any schema with compatible: ['ralink,mt7621-spi'] > > https://elixir.bootlin.com/linux/v6.0-rc5/source/Documentation/devicetree/bindings/spi/spi-mt7621.txt#L5 > >> /ethernet@1e100000: failed to match any schema with compatible: ['mediatek,mt7621-eth'] > > https://elixir.bootlin.com/linux/v6.0-rc5/source/Documentation/devicetree/bindings/net/ralink,rt2880-net.txt#L15 This binding is old and does not represent the current mtk_eth_soc driver. I already remove this with the first patch in the series so I’d rather do a new schema from scratch. Arınç
diff --git a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts index 24eebc5a85b1..6ecb8165efe8 100644 --- a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts +++ b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts @@ -53,7 +53,7 @@ system { }; }; -&sdhci { +&mmc { status = "okay"; }; diff --git a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts index 34006e667780..2e534ea5bab7 100644 --- a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts +++ b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts @@ -37,7 +37,7 @@ key-reset { }; }; -&sdhci { +&mmc { status = "okay"; }; diff --git a/arch/mips/boot/dts/ralink/mt7621.dtsi b/arch/mips/boot/dts/ralink/mt7621.dtsi index ee46ace0bcc1..294ee453ec36 100644 --- a/arch/mips/boot/dts/ralink/mt7621.dtsi +++ b/arch/mips/boot/dts/ralink/mt7621.dtsi @@ -33,11 +33,6 @@ cpuintc: cpuintc { compatible = "mti,cpu-interrupt-controller"; }; - aliases { - serial0 = &uartlite; - }; - - mmc_fixed_3v3: regulator-3v3 { compatible = "regulator-fixed"; regulator-name = "mmc_power"; @@ -115,12 +110,11 @@ memc: syscon@5000 { reg = <0x5000 0x1000>; }; - uartlite: uartlite@c00 { + serial0: serial@c00 { compatible = "ns16550a"; reg = <0xc00 0x100>; clocks = <&sysc MT7621_CLK_UART1>; - clock-names = "uart1"; interrupt-parent = <&gic>; interrupts = <GIC_SHARED 26 IRQ_TYPE_LEVEL_HIGH>; @@ -236,7 +230,7 @@ pinmux { }; }; - sdhci: sdhci@1e130000 { + mmc: mmc@1e130000 { status = "disabled"; compatible = "mediatek,mt7620-mmc"; @@ -262,8 +256,8 @@ sdhci: sdhci@1e130000 { interrupts = <GIC_SHARED 20 IRQ_TYPE_LEVEL_HIGH>; }; - xhci: xhci@1e1c0000 { - compatible = "mediatek,mt8173-xhci"; + usb: usb@1e1c0000 { + compatible = "mediatek,mt8173-xhci", "mediatek,mtk-xhci"; reg = <0x1e1c0000 0x1000 0x1e1d0700 0x0100>; reg-names = "mac", "ippc"; @@ -338,7 +332,7 @@ fixed-link { gmac1: mac@1 { compatible = "mediatek,eth-mac"; reg = <1>; - status = "off"; + status = "disabled"; phy-mode = "rgmii-rxid"; }; @@ -346,7 +340,7 @@ mdio: mdio-bus { #address-cells = <1>; #size-cells = <0>; - switch0: switch0@0 { + switch0: switch@0 { compatible = "mediatek,mt7621"; reg = <0>; mediatek,mcm; @@ -362,31 +356,31 @@ ports { #size-cells = <0>; port@0 { - status = "off"; + status = "disabled"; reg = <0>; label = "lan0"; }; port@1 { - status = "off"; + status = "disabled"; reg = <1>; label = "lan1"; }; port@2 { - status = "off"; + status = "disabled"; reg = <2>; label = "lan2"; }; port@3 { - status = "off"; + status = "disabled"; reg = <3>; label = "lan3"; }; port@4 { - status = "off"; + status = "disabled"; reg = <4>; label = "lan4"; };
Fix the dtc warnings below. uartlite@c00: $nodename:0: 'uartlite@c00' does not match '^serial(@.*)?$' From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/serial/8250.yaml uartlite@c00: Unevaluated properties are not allowed ('clock-names' was unexpected) From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/serial/8250.yaml sdhci@1e130000: $nodename:0: 'sdhci@1e130000' does not match '^mmc(@.*)?$' From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/mmc/mtk-sd.yaml sdhci@1e130000: Unevaluated properties are not allowed ('bus-width', 'cap-mmc-highspeed', 'cap-sd-highspeed', 'disable-wp', 'max-frequency', 'vmmc-supply', 'vqmmc-supply' were unexpected) From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/mmc/mtk-sd.yaml xhci@1e1c0000: $nodename:0: 'xhci@1e1c0000' does not match '^usb(@.*)?' From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml xhci@1e1c0000: compatible: ['mediatek,mt8173-xhci'] is too short From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml switch0@0: $nodename:0: 'switch0@0' does not match '^(ethernet-)?switch(@.*)?$' From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml port@1: status:0: 'off' is not one of ['okay', 'disabled', 'reserved'] From schema: /home/arinc9/.local/lib/python3.10/site-packages/dtschema/schemas/dt-core.yaml port@2: status:0: 'off' is not one of ['okay', 'disabled', 'reserved'] From schema: /home/arinc9/.local/lib/python3.10/site-packages/dtschema/schemas/dt-core.yaml port@3: status:0: 'off' is not one of ['okay', 'disabled', 'reserved'] From schema: /home/arinc9/.local/lib/python3.10/site-packages/dtschema/schemas/dt-core.yaml - Change "uartlite: uartlite@c00" to "serial0: serial@c00" and remove the aliases node. - Remove "clock-names" from the serial0 node. The property doesn't exist on the 8250.yaml schema. - Change "sdhci: sdhci@1e130000" to "mmc: mmc@1e130000". - Change "xhci: xhci@1e1c0000" to "usb: usb@1e1c0000". - Add "mediatek,mtk-xhci" as the second compatible string on the usb node. - Change "switch0: switch0@0" to "switch0: switch@0" - Change "off" to "disabled" for disabled nodes. Remaining warnings are caused by the lack of json-schema documentation. /cpuintc: failed to match any schema with compatible: ['mti,cpu-interrupt-controller'] /palmbus@1e000000/wdt@100: failed to match any schema with compatible: ['mediatek,mt7621-wdt'] /palmbus@1e000000/i2c@900: failed to match any schema with compatible: ['mediatek,mt7621-i2c'] /palmbus@1e000000/spi@b00: failed to match any schema with compatible: ['ralink,mt7621-spi'] /ethernet@1e100000: failed to match any schema with compatible: ['mediatek,mt7621-eth'] Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com> --- .../boot/dts/ralink/mt7621-gnubee-gb-pc1.dts | 2 +- .../boot/dts/ralink/mt7621-gnubee-gb-pc2.dts | 2 +- arch/mips/boot/dts/ralink/mt7621.dtsi | 28 ++++++++----------- 3 files changed, 13 insertions(+), 19 deletions(-)