arm64: dts: marvell: add Ethernet aliases

commit 474c5885582c4a79c21bcf01ed98f98c935f1f4a upstream.

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@marvell.com>
[Antoine: commit message, small fixes]
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
index 9c3bdf87e5433f2a800eae0a2a1e32c8c924dd88..51327645b3fbe416f19aa4b8be15359bc3d07113 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
@@ -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";

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
index 0d7b2ae4661002e7443297f680511950c87bfd8f..a4f82f1efbbc3fa0d4be5bb9bd7cb63aff139250 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
@@ -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";

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
index acf5c7d16d79b2f07eedf4691a1fc820073c7ffc..2b6b792dab9325e07b49ce31fda567b0c8de4ce4 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
@@ -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";