mvebu: backport mainline patches from kernel 3.12

[openwrt.git] / target / linux / mvebu / patches-3.10 / 0067-ARM-mvebu-set-aliases-for-ethernet-controllers.patch

diff --git a/target/linux/mvebu/patches-3.10/0067-ARM-mvebu-set-aliases-for-ethernet-controllers.patch b/target/linux/mvebu/patches-3.10/0067-ARM-mvebu-set-aliases-for-ethernet-controllers.patch
new file mode 100644 (file)
index 0000000..53d79cc
--- /dev/null
+++ b/target/linux/mvebu/patches-3.10/0067-ARM-mvebu-set-aliases-for-ethernet-controllers.patch
@@ -0,0 +1,90 @@
+From cc4fb487fbf95c97b40e1e8e5b8b2ddabc8d124d Mon Sep 17 00:00:00 2001
+From: Willy Tarreau <w@1wt.eu>
+Date: Mon, 3 Jun 2013 18:47:36 +0200
+Subject: [PATCH 067/203] 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>
+---
+ arch/arm/boot/dts/armada-370-xp.dtsi     | 9 +++++++--
+ arch/arm/boot/dts/armada-xp-mv78460.dtsi | 3 ++-
+ arch/arm/boot/dts/armada-xp.dtsi         | 6 +++++-
+ 3 files changed, 14 insertions(+), 4 deletions(-)
+
+--- a/arch/arm/boot/dts/armada-370-xp.dtsi
++++ b/arch/arm/boot/dts/armada-370-xp.dtsi
+@@ -24,6 +24,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";
+@@ -151,7 +156,7 @@
+                               reg = <0x72004 0x4>;
+                       };
+ 
+-                      ethernet@70000 {
++                      eth0: ethernet@70000 {
+                               compatible = "marvell,armada-370-neta";
+                               reg = <0x70000 0x4000>;
+                               interrupts = <8>;
+@@ -159,7 +164,7 @@
+                               status = "disabled";
+                       };
+ 
+-                      ethernet@74000 {
++                      eth1: ethernet@74000 {
+                               compatible = "marvell,armada-370-neta";
+                               reg = <0x74000 0x4000>;
+                               interrupts = <10>;
+--- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
++++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
+@@ -23,6 +23,7 @@
+               gpio0 = &gpio0;
+               gpio1 = &gpio1;
+               gpio2 = &gpio2;
++              eth3 = &eth3;
+       };
+ 
+ 
+@@ -326,7 +327,7 @@
+                               interrupts = <91>;
+                       };
+ 
+-                      ethernet@34000 {
++                      eth3: ethernet@34000 {
+                               compatible = "marvell,armada-370-neta";
+                               reg = <0x34000 0x4000>;
+                               interrupts = <14>;
+--- a/arch/arm/boot/dts/armada-xp.dtsi
++++ b/arch/arm/boot/dts/armada-xp.dtsi
+@@ -22,6 +22,10 @@
+       model = "Marvell Armada XP family SoC";
+       compatible = "marvell,armadaxp", "marvell,armada-370-xp";
+ 
++      aliases {
++              eth2 = &eth2;
++      };
++
+       soc {
+               compatible = "marvell,armadaxp-mbus", "simple-bus";
+ 
+@@ -93,7 +97,7 @@
+                               reg = <0x18200 0x500>;
+                       };
+ 
+-                      ethernet@30000 {
++                      eth2: ethernet@30000 {
+                               compatible = "marvell,armada-370-neta";
+                               reg = <0x30000 0x4000>;
+                               interrupts = <12>;