| From b64d814257b027e29a474bcd660f6372490138c7 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org> |
| Date: Mon, 7 Sep 2020 13:27:17 +0200 |
| Subject: arm64: dts: marvell: espressobin: Add ethernet switch aliases |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Pali Rohár <pali@kernel.org> |
| |
| commit b64d814257b027e29a474bcd660f6372490138c7 upstream. |
| |
| Espressobin boards have 3 ethernet ports and some of them got assigned more |
| then one MAC address. MAC addresses are stored in U-Boot environment. |
| |
| Since commit a2c7023f7075c ("net: dsa: read mac address from DT for slave |
| device") kernel can use MAC addresses from DT for particular DSA port. |
| |
| Currently Espressobin DTS file contains alias just for ethernet0. |
| |
| This patch defines additional ethernet aliases in Espressobin DTS files, so |
| bootloader can fill correct MAC address for DSA switch ports if more MAC |
| addresses were specified. |
| |
| DT alias ethernet1 is used for wan port, DT aliases ethernet2 and ethernet3 |
| are used for lan ports for both Espressobin revisions (V5 and V7). |
| |
| Fixes: 5253cb8c00a6f ("arm64: dts: marvell: espressobin: add ethernet alias") |
| Cc: <stable@vger.kernel.org> # a2c7023f7075c: dsa: read mac address |
| Signed-off-by: Pali Rohár <pali@kernel.org> |
| Reviewed-by: Andrew Lunn <andrew@lunn.ch> |
| Reviewed-by: Andre Heider <a.heider@gmail.com> |
| Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts | 10 ++++++-- |
| arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts | 10 ++++++-- |
| arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi | 12 ++++++---- |
| 3 files changed, 24 insertions(+), 8 deletions(-) |
| |
| --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts |
| +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts |
| @@ -20,17 +20,23 @@ |
| compatible = "globalscale,espressobin-v7-emmc", "globalscale,espressobin-v7", |
| "globalscale,espressobin", "marvell,armada3720", |
| "marvell,armada3710"; |
| + |
| + aliases { |
| + /* ethernet1 is wan port */ |
| + ethernet1 = &switch0port3; |
| + ethernet3 = &switch0port1; |
| + }; |
| }; |
| |
| &switch0 { |
| ports { |
| - port@1 { |
| + switch0port1: port@1 { |
| reg = <1>; |
| label = "lan1"; |
| phy-handle = <&switch0phy0>; |
| }; |
| |
| - port@3 { |
| + switch0port3: port@3 { |
| reg = <3>; |
| label = "wan"; |
| phy-handle = <&switch0phy2>; |
| --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts |
| +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts |
| @@ -19,17 +19,23 @@ |
| model = "Globalscale Marvell ESPRESSOBin Board V7"; |
| compatible = "globalscale,espressobin-v7", "globalscale,espressobin", |
| "marvell,armada3720", "marvell,armada3710"; |
| + |
| + aliases { |
| + /* ethernet1 is wan port */ |
| + ethernet1 = &switch0port3; |
| + ethernet3 = &switch0port1; |
| + }; |
| }; |
| |
| &switch0 { |
| ports { |
| - port@1 { |
| + switch0port1: port@1 { |
| reg = <1>; |
| label = "lan1"; |
| phy-handle = <&switch0phy0>; |
| }; |
| |
| - port@3 { |
| + switch0port3: port@3 { |
| reg = <3>; |
| label = "wan"; |
| phy-handle = <&switch0phy2>; |
| --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi |
| +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi |
| @@ -13,6 +13,10 @@ |
| / { |
| aliases { |
| ethernet0 = ð0; |
| + /* for dsa slave device */ |
| + ethernet1 = &switch0port1; |
| + ethernet2 = &switch0port2; |
| + ethernet3 = &switch0port3; |
| serial0 = &uart0; |
| serial1 = &uart1; |
| }; |
| @@ -120,7 +124,7 @@ |
| #address-cells = <1>; |
| #size-cells = <0>; |
| |
| - port@0 { |
| + switch0port0: port@0 { |
| reg = <0>; |
| label = "cpu"; |
| ethernet = <ð0>; |
| @@ -131,19 +135,19 @@ |
| }; |
| }; |
| |
| - port@1 { |
| + switch0port1: port@1 { |
| reg = <1>; |
| label = "wan"; |
| phy-handle = <&switch0phy0>; |
| }; |
| |
| - port@2 { |
| + switch0port2: port@2 { |
| reg = <2>; |
| label = "lan0"; |
| phy-handle = <&switch0phy1>; |
| }; |
| |
| - port@3 { |
| + switch0port3: port@3 { |
| reg = <3>; |
| label = "lan1"; |
| phy-handle = <&switch0phy2>; |