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

   1 From cc4fb487fbf95c97b40e1e8e5b8b2ddabc8d124d Mon Sep 17 00:00:00 2001
   2 From: Willy Tarreau <w@1wt.eu>
   3 Date: Mon, 3 Jun 2013 18:47:36 +0200
   4 Subject: [PATCH 067/203] ARM: mvebu: set aliases for ethernet controllers
   5
   6 These aliases are used when feeding the DT from ATAGS to set the
   7 devices MAC addresses.
   8
   9 Signed-off-by: Willy Tarreau <w@1wt.eu>
  10 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  11 Signed-off-by: Jason Cooper <jason@lakedaemon.net>
  12 ---
  13  arch/arm/boot/dts/armada-370-xp.dtsi     | 9 +++++++--
  14  arch/arm/boot/dts/armada-xp-mv78460.dtsi | 3 ++-
  15  arch/arm/boot/dts/armada-xp.dtsi         | 6 +++++-
  16  3 files changed, 14 insertions(+), 4 deletions(-)
  17
  18 --- a/arch/arm/boot/dts/armada-370-xp.dtsi
  19 +++ b/arch/arm/boot/dts/armada-370-xp.dtsi
  20 @@ -24,6 +24,11 @@
  21         model = "Marvell Armada 370 and XP SoC";
  22         compatible = "marvell,armada-370-xp";
  23
  24 +       aliases {
  25 +               eth0 = &eth0;
  26 +               eth1 = &eth1;
  27 +       };
  28 +
  29         cpus {
  30                 cpu@0 {
  31                         compatible = "marvell,sheeva-v7";
  32 @@ -151,7 +156,7 @@
  33                                 reg = <0x72004 0x4>;
  34                         };
  35
  36 -                       ethernet@70000 {
  37 +                       eth0: ethernet@70000 {
  38                                 compatible = "marvell,armada-370-neta";
  39                                 reg = <0x70000 0x4000>;
  40                                 interrupts = <8>;
  41 @@ -159,7 +164,7 @@
  42                                 status = "disabled";
  43                         };
  44
  45 -                       ethernet@74000 {
  46 +                       eth1: ethernet@74000 {
  47                                 compatible = "marvell,armada-370-neta";
  48                                 reg = <0x74000 0x4000>;
  49                                 interrupts = <10>;
  50 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
  51 +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
  52 @@ -23,6 +23,7 @@
  53                 gpio0 = &gpio0;
  54                 gpio1 = &gpio1;
  55                 gpio2 = &gpio2;
  56 +               eth3 = &eth3;
  57         };
  58
  59
  60 @@ -326,7 +327,7 @@
  61                                 interrupts = <91>;
  62                         };
  63
  64 -                       ethernet@34000 {
  65 +                       eth3: ethernet@34000 {
  66                                 compatible = "marvell,armada-370-neta";
  67                                 reg = <0x34000 0x4000>;
  68                                 interrupts = <14>;
  69 --- a/arch/arm/boot/dts/armada-xp.dtsi
  70 +++ b/arch/arm/boot/dts/armada-xp.dtsi
  71 @@ -22,6 +22,10 @@
  72         model = "Marvell Armada XP family SoC";
  73         compatible = "marvell,armadaxp", "marvell,armada-370-xp";
  74
  75 +       aliases {
  76 +               eth2 = &eth2;
  77 +       };
  78 +
  79         soc {
  80                 compatible = "marvell,armadaxp-mbus", "simple-bus";
  81
  82 @@ -93,7 +97,7 @@
  83                                 reg = <0x18200 0x500>;
  84                         };
  85
  86 -                       ethernet@30000 {
  87 +                       eth2: ethernet@30000 {
  88                                 compatible = "marvell,armada-370-neta";
  89                                 reg = <0x30000 0x4000>;
  90                                 interrupts = <12>;