arm64: dts: marvell: eDPU: drop redundant address/size-cells
Subsystems (3)
PATCH 1/3 arm64: dts: marvell: eDPU: drop redundant address/size-cells
The ethernet-switch node does not have children with unit addresses, so address/size-cells are not really correct, as reported by dtc W=1 warning:
armada-3720-eDPU.dts:26.19-60.4: Warning (avoid_unnecessary_addr_size): /soc/internal-regs@d0000000/mdio@32004/switch@0: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
This probably also fixes dtbs_check warning, but I could not find it, so not sure about that.
--- arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts | 2 -- 1 file changed, 2 deletions(-)
arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts +0 -2
@@ -25,8 +25,6 @@ &mdio { /* Actual device is MV88E6361 */ switch: switch@0 { compatible = "marvell,mv88e6190"; - #address-cells = <1>; - #size-cells = <0>; reg = <0>; status = "disabled";
Signature · 1 line
2.34.1
PATCH 2/3 arm64: dts: marvell: turris-mox: drop unneeded flash address/size-cells
Flash node uses single "partition" node to describe partitions, so remove deprecated address/size-cells properties to also fix dtc W=1 warnings:
armada-3720-turris-mox.dts:218.10-255.4: Warning (avoid_unnecessary_addr_size): /soc/internal-regs@d0000000/spi@10600/flash@0: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
--- arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 -- 1 file changed, 2 deletions(-)
arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +0 -2
@@ -216,8 +216,6 @@ &spi0 { assigned-clock-rates = <20000000>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <20000000>;
Signature · 1 line
2.34.1
PATCH 3/3 arm64: dts: marvell: espressobin-ultra: fix Ethernet Switch unit address
In reply to Krzysztof KozlowskiThe Espressobin Ultra DTS includes Espressobin DTSI which defines ethernet-switch@1 node. The Ultra DTS overrides "reg" to 3, but that leaves still old unit address which conflicts with the new phy@1 node (W=1 dtc warning):
armada-3720-espressobin.dtsi:148.29-203.4: Warning (unique_unit_address_if_enabled): /soc/internal-regs@d0000000/mdio@32004/ethernet-switch@1: duplicate unit-address (also used in node /soc/internal-regs@d0000000/mdio@32004/ethernet-phy@1)
Fix this by deleting ethernet-switch@1 node and merging original node with code from Ultra DTS into new ethernet-switch@3.
---
Not tested on hardware.
--- .../marvell/armada-3720-espressobin-ultra.dts | 104 +++++++++++------- 1 file changed, 67 insertions(+), 37 deletions(-)
arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts +67 -37
@@ -114,54 +114,84 @@ &usb3 { }; &mdio { + /* Switch is @3, not @1 */ + /delete-node/ ethernet-switch@1; extphy: ethernet-phy@1 { reg = <1>; reset-gpios = <&gpionb 2 GPIO_ACTIVE_LOW>; }; -}; -&switch0 { - reg = <3>; + switch0: ethernet-switch@3 { + compatible = "marvell,mv88e6085"; + reg = <3>; - reset-gpios = <&gpiosb 23 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpiosb 23 GPIO_ACTIVE_LOW>; + dsa,member = <0 0>; - ethernet-ports { - switch0port1: ethernet-port@1 { - reg = <1>; - label = "lan0"; - phy-handle = <&switch0phy0>; + ethernet-ports { + #address-cells = <1>; + #size-cells = <0>; + + switch0port0: ethernet-port@0 { + reg = <0>; + label = "cpu"; + ethernet = <ð0>; + phy-mode = "rgmii-id"; + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + switch0port1: ethernet-port@1 { + reg = <1>; + label = "lan0"; + phy-handle = <&switch0phy0>; + }; + + switch0port2: ethernet-port@2 { + reg = <2>; + label = "lan1"; + phy-handle = <&switch0phy1>; + }; + + switch0port3: ethernet-port@3 { + reg = <3>; + label = "lan2"; + phy-handle = <&switch0phy2>; + }; + + switch0port4: ethernet-port@4 { + reg = <4>; + label = "lan3"; + phy-handle = <&switch0phy3>; + }; + + switch0port5: ethernet-port@5 { + reg = <5>; + label = "wan"; + phy-handle = <&extphy>; + phy-mode = "sgmii"; + }; }; - switch0port2: ethernet-port@2 { - reg = <2>; - label = "lan1"; - phy-handle = <&switch0phy1>; - }; + mdio { + #address-cells = <1>; + #size-cells = <0>; - switch0port3: ethernet-port@3 { - reg = <3>; - label = "lan2"; - phy-handle = <&switch0phy2>; - }; - - switch0port4: ethernet-port@4 { - reg = <4>; - label = "lan3"; - phy-handle = <&switch0phy3>; - }; - - switch0port5: ethernet-port@5 { - reg = <5>; - label = "wan"; - phy-handle = <&extphy>; - phy-mode = "sgmii"; - }; - }; - - mdio { - switch0phy3: ethernet-phy@14 { - reg = <0x14>; + switch0phy0: ethernet-phy@11 { + reg = <0x11>; + }; + switch0phy1: ethernet-phy@12 { + reg = <0x12>; + }; + switch0phy2: ethernet-phy@13 { + reg = <0x13>; + }; + switch0phy3: ethernet-phy@14 { + reg = <0x14>; + }; }; }; };
Signature · 1 line
2.34.1
Quoted 10 lines · Krzysztof Kozlowski
The ethernet-switch node does not have children with unit addresses, so address/size-cells are not really correct, as reported by dtc W=1 warning:
armada-3720-eDPU.dts:26.19-60.4: Warning (
avoid_unnecessary_addr_size): /soc/internal-regs@d0000000/mdio@32004/switch@0: unnecessary #address-cells/#size-cells without "ranges" or child "reg" propertyThis probably also fixes
dtbs_checkwarning, but I could not find it, so not sure about that.Signed-off-by Krzysztof Kozlowski <[email protected]>
Andrew
Re: [PATCH 2/3] arm64: dts: marvell: turris-mox: drop unneeded flash address/size-cells
In reply to Krzysztof KozlowskiQuoted 7 lines · Krzysztof Kozlowski
Flash node uses single "partition" node to describe partitions, so remove deprecated address/size-cells properties to also fix dtc W=1 warnings:
armada-3720-turris-mox.dts:218.10-255.4: Warning (
avoid_unnecessary_addr_size): /soc/internal-regs@d0000000/spi@10600/flash@0: unnecessary #address-cells/#size-cells without "ranges" or child "reg" propertySigned-off-by Krzysztof Kozlowski <[email protected]>
Andrew
Andrew Lunn
maintainerRe: [PATCH 3/3] arm64: dts: marvell: espressobin-ultra: fix Ethernet Switch unit address
In reply to Krzysztof KozlowskiQuoted 9 lines · Krzysztof Kozlowski
The Espressobin Ultra DTS includes Espressobin DTSI which defines ethernet-switch@1 node. The Ultra DTS overrides "reg" to 3, but that leaves still old unit address which conflicts with the new phy@1 node (W=1 dtc warning):
armada-3720-espressobin.dtsi:148.29-203.4: Warning (
unique_unit_address_if_enabled): /soc/internal-regs@d0000000/mdio@32004/ethernet-switch@1: duplicate unit-address (also used in node /soc/internal-regs@d0000000/mdio@32004/ethernet-phy@1)Fix this by deleting ethernet-switch@1 node and merging original node with code from Ultra DTS into new ethernet-switch@3.
That is a bit ugly, having the exact same code twice.
Could the bulk of the switch node be put into a .dtsi file, and then included as needed
&mdio {
switch0: ethernet-switch@1 {
reg = <1>;
include "armada-3720-espressobin-switch.dtsi"
}
}&mdio {
switch0: ethernet-switch@3 {
reg = <3>;
include "armada-3720-espressobin-switch.dtsi"
}
}Andrew
Re: [PATCH 2/3] arm64: dts: marvell: turris-mox: drop unneeded flash address/size-cells
In reply to Krzysztof KozlowskiQuoted 16 lines · On Tue, 2 Apr 2024 20:32:39 +0200 Krzysztof Kozlowski <[email protected]> wrote:
Flash node uses single "partition" node to describe partitions, so remove deprecated address/size-cells properties to also fix dtc W=1 warnings:
armada-3720-turris-mox.dts:218.10-255.4: Warning (
avoid_unnecessary_addr_size): /soc/internal-regs@d0000000/spi@10600/flash@0: unnecessary #address-cells/#size-cells without "ranges" or child "reg" propertySigned-off-by Krzysztof Kozlowski <[email protected]>--- arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 -- 1 file changed, 2 deletions(-)arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +0
-0
arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts &spi0 { · line 221
Quoted 8 lines
arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +0
-2@@ -216,8 +216,6 @@ &spi0 { assigned-clock-rates = <20000000>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <20000000>;
Re: [PATCH 3/3] arm64: dts: marvell: espressobin-ultra: fix Ethernet Switch unit address
In reply to Andrew LunnQuoted 8 lines · Andrew Lunn
Quoted 7 lines · Krzysztof Kozlowski
The Espressobin Ultra DTS includes Espressobin DTSI which defines ethernet-switch@1 node. The Ultra DTS overrides "reg" to 3, but that leaves still old unit address which conflicts with the new phy@1 node (W=1 dtc warning):
armada-3720-espressobin.dtsi:148.29-203.4: Warning (
unique_unit_address_if_enabled): /soc/internal-regs@d0000000/mdio@32004/ethernet-switch@1: duplicate unit-address (also used in node /soc/internal-regs@d0000000/mdio@32004/ethernet-phy@1)
Quoted 7 lines
Quoted 2 lines
Fix this by deleting ethernet-switch@1 node and merging original node with code from Ultra DTS into new ethernet-switch@3.
That is a bit ugly, having the exact same code twice.
Could the bulk of the switch node be put into a .dtsi file, and then included as needed
There are several overrides/new nodes in espresso ultra, so this is not the same code.
Quoted 5 lines
&mdio {
switch0: ethernet-switch@1 {
reg = <1>;
include "armada-3720-espressobin-switch.dtsi"And this DTSI would be with what? No device node? That's not readable.
Quoted 3 lines
}
}Best regards,
Krzysztof
Gregory CLEMENT
maintainerQuoted 10 lines · Krzysztof Kozlowski
The ethernet-switch node does not have children with unit addresses, so address/size-cells are not really correct, as reported by dtc W=1 warning:
armada-3720-eDPU.dts:26.19-60.4: Warning (
avoid_unnecessary_addr_size): /soc/internal-regs@d0000000/mdio@32004/switch@0: unnecessary #address-cells/#size-cells without "ranges" or child "reg" propertyThis probably also fixes
dtbs_checkwarning, but I could not find it, so not sure about that.Signed-off-by Krzysztof Kozlowski <[email protected]>
Applied on mvebu/dt64 as well as the 2 other pacthes.
Thanks,
Gregory
Quoted 19 lines
--- arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts | 2 -- 1 file changed, 2 deletions(-)arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts +0
-2@@ -25,8 +25,6 @@ &mdio { /* Actual device is MV88E6361 */ switch: switch@0 { compatible = "marvell,mv88e6190"; - #address-cells = <1>; - #size-cells = <0>; reg = <0>; status = "disabled";Signature · 1 line
2.34.1