aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilly Tarreau <w@1wt.eu>2013-06-03 12:47:36 -0400
committerJason Cooper <jason@lakedaemon.net>2013-06-04 10:15:07 -0400
commitbe5a9389e82054ebd8c15b3d6354ec5c1568cb7c (patch)
tree428281b91f829958d76be893511f747a89832b22
parent33a6675485f27adc182faa856944836e85520fa1 (diff)
ARM: mvebu: set aliases for ethernet controllers
These aliases are used when feeding the DT from ATAGS to set the devices MAC addresses. Signed-off-by: Willy Tarreau <w@1wt.eu> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r--arch/arm/boot/dts/armada-370-xp.dtsi9
-rw-r--r--arch/arm/boot/dts/armada-xp-mv78460.dtsi3
-rw-r--r--arch/arm/boot/dts/armada-xp.dtsi6
3 files changed, 14 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 031894eb5ef8..f7da39453d2f 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -22,6 +22,11 @@
22 model = "Marvell Armada 370 and XP SoC"; 22 model = "Marvell Armada 370 and XP SoC";
23 compatible = "marvell,armada-370-xp"; 23 compatible = "marvell,armada-370-xp";
24 24
25 aliases {
26 eth0 = &eth0;
27 eth1 = &eth1;
28 };
29
25 cpus { 30 cpus {
26 cpu@0 { 31 cpu@0 {
27 compatible = "marvell,sheeva-v7"; 32 compatible = "marvell,sheeva-v7";
@@ -93,7 +98,7 @@
93 reg = <0x72004 0x4>; 98 reg = <0x72004 0x4>;
94 }; 99 };
95 100
96 ethernet@70000 { 101 eth0: ethernet@70000 {
97 compatible = "marvell,armada-370-neta"; 102 compatible = "marvell,armada-370-neta";
98 reg = <0x70000 0x2500>; 103 reg = <0x70000 0x2500>;
99 interrupts = <8>; 104 interrupts = <8>;
@@ -101,7 +106,7 @@
101 status = "disabled"; 106 status = "disabled";
102 }; 107 };
103 108
104 ethernet@74000 { 109 eth1: ethernet@74000 {
105 compatible = "marvell,armada-370-neta"; 110 compatible = "marvell,armada-370-neta";
106 reg = <0x74000 0x2500>; 111 reg = <0x74000 0x2500>;
107 interrupts = <10>; 112 interrupts = <10>;
diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
index 6ab56bd35de9..386f0ce48453 100644
--- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
@@ -23,6 +23,7 @@
23 gpio0 = &gpio0; 23 gpio0 = &gpio0;
24 gpio1 = &gpio1; 24 gpio1 = &gpio1;
25 gpio2 = &gpio2; 25 gpio2 = &gpio2;
26 eth3 = &eth3;
26 }; 27 };
27 28
28 29
@@ -105,7 +106,7 @@
105 interrupts = <91>; 106 interrupts = <91>;
106 }; 107 };
107 108
108 ethernet@34000 { 109 eth3: ethernet@34000 {
109 compatible = "marvell,armada-370-neta"; 110 compatible = "marvell,armada-370-neta";
110 reg = <0x34000 0x2500>; 111 reg = <0x34000 0x2500>;
111 interrupts = <14>; 112 interrupts = <14>;
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index bacab11c10dc..6a82fe827ad8 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -22,6 +22,10 @@
22 model = "Marvell Armada XP family SoC"; 22 model = "Marvell Armada XP family SoC";
23 compatible = "marvell,armadaxp", "marvell,armada-370-xp"; 23 compatible = "marvell,armadaxp", "marvell,armada-370-xp";
24 24
25 aliases {
26 eth2 = &eth2;
27 };
28
25 soc { 29 soc {
26 internal-regs { 30 internal-regs {
27 L2: l2-cache { 31 L2: l2-cache {
@@ -86,7 +90,7 @@
86 reg = <0x18200 0x500>; 90 reg = <0x18200 0x500>;
87 }; 91 };
88 92
89 ethernet@30000 { 93 eth2: ethernet@30000 {
90 compatible = "marvell,armada-370-neta"; 94 compatible = "marvell,armada-370-neta";
91 reg = <0x30000 0x2500>; 95 reg = <0x30000 0x2500>;
92 interrupts = <12>; 96 interrupts = <12>;