Re: [PATCH 3/3] arm64: dts: marvell: espressobin-ultra: fix Ethernet Switch unit address

Andrew Lunn
2024-04-02T19:27:08Z

On Tue, Apr 02, 2024 at 08:32:40PM +0200, Krzysztof Kozlowski wrote:
> 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