arm64: dts: marvell: espressobin-ultra: fix Ethernet Switch unit address
authorKrzysztof Kozlowski <krzk@kernel.org>
Tue, 2 Apr 2024 18:32:40 +0000 (20:32 +0200)
committerGregory CLEMENT <gregory.clement@bootlin.com>
Sun, 5 May 2024 16:03:31 +0000 (18:03 +0200)
commit4289937de5ca3d82e4ee70f30e30f9f0cdcda6a2
tree0d8fb4a119c764c7beeacbe3ed555c9006aa8f84
parent34f5746a8c1b308ea9a80dd80166c051220c2023
arm64: dts: marvell: espressobin-ultra: fix Ethernet Switch unit address

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.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts