Skip to content

Commit

Permalink
ARM: mvebu: set aliases for ethernet controllers
Browse files Browse the repository at this point in the history
These aliases are used when feeding the DT from ATAGS to set the
devices MAC addresses.

Signed-off-by: Willy Tarreau <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>
Signed-off-by: Jason Cooper <[email protected]>
  • Loading branch information
wtarreau authored and Jason Cooper committed Jun 4, 2013
1 parent 33a6675 commit be5a938
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
9 changes: 7 additions & 2 deletions arch/arm/boot/dts/armada-370-xp.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
model = "Marvell Armada 370 and XP SoC";
compatible = "marvell,armada-370-xp";

aliases {
eth0 = &eth0;
eth1 = &eth1;
};

cpus {
cpu@0 {
compatible = "marvell,sheeva-v7";
Expand Down Expand Up @@ -93,15 +98,15 @@
reg = <0x72004 0x4>;
};

ethernet@70000 {
eth0: ethernet@70000 {
compatible = "marvell,armada-370-neta";
reg = <0x70000 0x2500>;
interrupts = <8>;
clocks = <&gateclk 4>;
status = "disabled";
};

ethernet@74000 {
eth1: ethernet@74000 {
compatible = "marvell,armada-370-neta";
reg = <0x74000 0x2500>;
interrupts = <10>;
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/armada-xp-mv78460.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
gpio0 = &gpio0;
gpio1 = &gpio1;
gpio2 = &gpio2;
eth3 = &eth3;
};


Expand Down Expand Up @@ -105,7 +106,7 @@
interrupts = <91>;
};

ethernet@34000 {
eth3: ethernet@34000 {
compatible = "marvell,armada-370-neta";
reg = <0x34000 0x2500>;
interrupts = <14>;
Expand Down
6 changes: 5 additions & 1 deletion arch/arm/boot/dts/armada-xp.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
model = "Marvell Armada XP family SoC";
compatible = "marvell,armadaxp", "marvell,armada-370-xp";

aliases {
eth2 = &eth2;
};

soc {
internal-regs {
L2: l2-cache {
Expand Down Expand Up @@ -86,7 +90,7 @@
reg = <0x18200 0x500>;
};

ethernet@30000 {
eth2: ethernet@30000 {
compatible = "marvell,armada-370-neta";
reg = <0x30000 0x2500>;
interrupts = <12>;
Expand Down

0 comments on commit be5a938

Please sign in to comment.