mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +00:00
89 lines
2.8 KiB
Diff
89 lines
2.8 KiB
Diff
|
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: [PATCH] arm64: dts: marvell: espressobin: Add ethernet switch aliases
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
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>
|
||
|
|
---
|
||
|
|
.../dts/marvell/armada-3720-espressobin-v7-emmc.dts | 10 ++++++++--
|
||
|
|
.../boot/dts/marvell/armada-3720-espressobin-v7.dts | 10 ++++++++--
|
||
|
|
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
|
||
|
|
@@ -15,16 +15,22 @@
|
||
|
|
compatible = "globalscale,espressobin-v7-emmc", "globalscale,espressobin-v7",
|
||
|
|
"globalscale,espressobin", "marvell,armada3720",
|
||
|
|
"marvell,armada3710";
|
||
|
|
+
|
||
|
|
+ aliases {
|
||
|
|
+ /* ethernet1 is wan port */
|
||
|
|
+ ethernet1 = &switch0port3;
|
||
|
|
+ ethernet3 = &switch0port1;
|
||
|
|
+ };
|
||
|
|
};
|
||
|
|
|
||
|
|
&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
|
||
|
|
@@ -14,16 +14,22 @@
|
||
|
|
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;
|
||
|
|
+ };
|
||
|
|
};
|
||
|
|
|
||
|
|
&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>;
|