Hi
I'm submitting this upstream patch to be backported to stable branches
4.14 and 4.15.
This patch fixes invalid ethernet addresses on the MacchiatoBIN board (I
tested it on the kernel 4.4.19). This patch differs slightly from the
upstream patch because in the kernel 4.16-rc1 "cpm" was renamed to "cp0"
and "cps" to "cp1".
Mikulas
commit 474c5885582c4a79c21bcf01ed98f98c935f1f4a
Author: Yan Markman <ymarkman@xxxxxxxxxxx>
Date: Wed Jan 3 16:18:52 2018 +0100
arm64: dts: marvell: add Ethernet aliases
This patch adds Ethernet aliases in the Marvell Armada 7040 DB, 8040 DB
and 8040 mcbin device trees so that the bootloader setup the MAC
addresses correctly.
Signed-off-by: Yan Markman <ymarkman@xxxxxxxxxxx>
[Antoine: commit message, small fixes]
Signed-off-by: Antoine Tenart <antoine.tenart@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Gregory CLEMENT <gregory.clement@xxxxxxxxxxxxxxxxxx>
---
arch/arm64/boot/dts/marvell/armada-7040-db.dts | 6 ++++++
arch/arm64/boot/dts/marvell/armada-8040-db.dts | 7 +++++++
arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 6 ++++++
3 files changed, 19 insertions(+)
Index: linux-4.14.19/arch/arm64/boot/dts/marvell/armada-7040-db.dts
===================================================================
--- linux-4.14.19.orig/arch/arm64/boot/dts/marvell/armada-7040-db.dts 2018-02-14 01:39:33.000000000 +0100
+++ linux-4.14.19/arch/arm64/boot/dts/marvell/armada-7040-db.dts 2018-02-14 01:39:33.000000000 +0100
@@ -61,6 +61,12 @@
reg = <0x0 0x0 0x0 0x80000000>;
};
+ aliases {
+ ethernet0 = &cpm_eth0;
+ ethernet1 = &cpm_eth1;
+ ethernet2 = &cpm_eth2;
+ };
+
cpm_reg_usb3_0_vbus: cpm-usb3-0-vbus {
compatible = "regulator-fixed";
regulator-name = "usb3h0-vbus";
Index: linux-4.14.19/arch/arm64/boot/dts/marvell/armada-8040-db.dts
===================================================================
--- linux-4.14.19.orig/arch/arm64/boot/dts/marvell/armada-8040-db.dts 2018-02-14 01:39:33.000000000 +0100
+++ linux-4.14.19/arch/arm64/boot/dts/marvell/armada-8040-db.dts 2018-02-14 01:39:33.000000000 +0100
@@ -61,6 +61,13 @@
reg = <0x0 0x0 0x0 0x80000000>;
};
+ aliases {
+ ethernet0 = &cpm_eth0;
+ ethernet1 = &cpm_eth2;
+ ethernet2 = &cps_eth0;
+ ethernet3 = &cps_eth1;
+ };
+
cpm_reg_usb3_0_vbus: cpm-usb3-0-vbus {
compatible = "regulator-fixed";
regulator-name = "cpm-usb3h0-vbus";
Index: linux-4.14.19/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
===================================================================
--- linux-4.14.19.orig/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts 2018-02-14 01:39:33.000000000 +0100
+++ linux-4.14.19/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts 2018-02-14 01:45:05.000000000 +0100
@@ -62,6 +62,12 @@
reg = <0x0 0x0 0x0 0x80000000>;
};
+ aliases {
+ ethernet0 = &cpm_eth0;
+ ethernet1 = &cps_eth0;
+ ethernet2 = &cps_eth1;
+ };
+
/* Regulator labels correspond with schematics */
v_3_3: regulator-3-3v {
compatible = "regulator-fixed";