Skip to content

Commit

Permalink
mips: dts: ralink: mt7621: fix some dtc warnings
Browse files Browse the repository at this point in the history
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
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 "memc: syscon@5000" to "memc: memory-controller@5000".
- 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.

Signed-off-by: Arınç ÜNAL <[email protected]>
Reviewed-by: Sergio Paracuellos <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
arinc9 authored and davem330 committed Sep 23, 2022
1 parent 862b19b commit 5ae75a1
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 20 deletions.
2 changes: 1 addition & 1 deletion arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
};
};

&sdhci {
&mmc {
status = "okay";
};

Expand Down
2 changes: 1 addition & 1 deletion arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
};
};

&sdhci {
&mmc {
status = "okay";
};

Expand Down
30 changes: 12 additions & 18 deletions arch/mips/boot/dts/ralink/mt7621.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,6 @@
compatible = "mti,cpu-interrupt-controller";
};

aliases {
serial0 = &uartlite;
};


mmc_fixed_3v3: regulator-3v3 {
compatible = "regulator-fixed";
regulator-name = "mmc_power";
Expand Down Expand Up @@ -110,17 +105,16 @@
pinctrl-0 = <&i2c_pins>;
};

memc: syscon@5000 {
memc: memory-controller@5000 {
compatible = "mediatek,mt7621-memc", "syscon";
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>;
Expand Down Expand Up @@ -236,7 +230,7 @@
};
};

sdhci: sdhci@1e130000 {
mmc: mmc@1e130000 {
status = "disabled";

compatible = "mediatek,mt7620-mmc";
Expand All @@ -262,8 +256,8 @@
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";
Expand Down Expand Up @@ -338,15 +332,15 @@
gmac1: mac@1 {
compatible = "mediatek,eth-mac";
reg = <1>;
status = "off";
status = "disabled";
phy-mode = "rgmii-rxid";
};

mdio: mdio-bus {
#address-cells = <1>;
#size-cells = <0>;

switch0: switch0@0 {
switch0: switch@0 {
compatible = "mediatek,mt7621";
reg = <0>;
mediatek,mcm;
Expand All @@ -362,31 +356,31 @@
#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";
};
Expand Down

0 comments on commit 5ae75a1

Please sign in to comment.