target/linux/mvebu/patches-3.18/024-ARM-mvebu-a38x-Fix-node-names.patch

   1 From 4a25432b13090b57d257fa0ffb6712d8acf94523 Mon Sep 17 00:00:00 2001
   2 From: Maxime Ripard <maxime.ripard@free-electrons.com>
   3 Date: Thu, 8 Jan 2015 18:38:05 +0100
   4 Subject: [PATCH 1/4] ARM: mvebu: a38x: Fix node names
   5
   6 Some nodes in the DTs have a reg property but no unit name in their node name.
   7
   8 This contradicts the way the ePAPR defines the node names. Fix this.
   9
  10 Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  11 Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
  12 Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
  13 Signed-off-by: Andrew Lunn <andrew@lunn.ch>
  14 ---
  15  arch/arm/boot/dts/armada-380.dtsi   | 2 +-
  16  arch/arm/boot/dts/armada-385-db.dts | 2 +-
  17  arch/arm/boot/dts/armada-385-rd.dts | 2 +-
  18  arch/arm/boot/dts/armada-385.dtsi   | 2 +-
  19  arch/arm/boot/dts/armada-38x.dtsi   | 4 ++--
  20  5 files changed, 6 insertions(+), 6 deletions(-)
  21
  22 diff --git a/arch/arm/boot/dts/armada-380.dtsi b/arch/arm/boot/dts/armada-380.dtsi
  23 index 4173a8ab34e7..13400ce88c54 100644
  24 --- a/arch/arm/boot/dts/armada-380.dtsi
  25 +++ b/arch/arm/boot/dts/armada-380.dtsi
  26 @@ -32,7 +32,7 @@
  27
  28         soc {
  29                 internal-regs {
  30 -                       pinctrl {
  31 +                       pinctrl@18000 {
  32                                 compatible = "marvell,mv88f6810-pinctrl";
  33                                 reg = <0x18000 0x20>;
  34                         };
  35 diff --git a/arch/arm/boot/dts/armada-385-db.dts b/arch/arm/boot/dts/armada-385-db.dts
  36 index 2aaa9d2ac284..212605ccc7b6 100644
  37 --- a/arch/arm/boot/dts/armada-385-db.dts
  38 +++ b/arch/arm/boot/dts/armada-385-db.dts
  39 @@ -74,7 +74,7 @@
  40                                 phy-mode = "rgmii-id";
  41                         };
  42
  43 -                       mdio {
  44 +                       mdio@72004 {
  45                                 phy0: ethernet-phy@0 {
  46                                         reg = <0>;
  47                                 };
  48 diff --git a/arch/arm/boot/dts/armada-385-rd.dts b/arch/arm/boot/dts/armada-385-rd.dts
  49 index aaca2861dc87..74a3bfe6efd7 100644
  50 --- a/arch/arm/boot/dts/armada-385-rd.dts
  51 +++ b/arch/arm/boot/dts/armada-385-rd.dts
  52 @@ -67,7 +67,7 @@
  53                         };
  54
  55
  56 -                       mdio {
  57 +                       mdio@72004 {
  58                                 phy0: ethernet-phy@0 {
  59                                         reg = <0>;
  60                                 };
  61 diff --git a/arch/arm/boot/dts/armada-385.dtsi b/arch/arm/boot/dts/armada-385.dtsi
  62 index 6283d7912f71..5249a4d3c207 100644
  63 --- a/arch/arm/boot/dts/armada-385.dtsi
  64 +++ b/arch/arm/boot/dts/armada-385.dtsi
  65 @@ -37,7 +37,7 @@
  66
  67         soc {
  68                 internal-regs {
  69 -                       pinctrl {
  70 +                       pinctrl@18000 {
  71                                 compatible = "marvell,mv88f6820-pinctrl";
  72                                 reg = <0x18000 0x20>;
  73                         };
  74 diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
  75 index 74391dace9e7..ada1f206028b 100644
  76 --- a/arch/arm/boot/dts/armada-38x.dtsi
  77 +++ b/arch/arm/boot/dts/armada-38x.dtsi
  78 @@ -193,7 +193,7 @@
  79                                 status = "disabled";
  80                         };
  81
  82 -                       pinctrl {
  83 +                       pinctrl@18000 {
  84                                 compatible = "marvell,mv88f6820-pinctrl";
  85                                 reg = <0x18000 0x20>;
  86                         };
  87 @@ -373,7 +373,7 @@
  88                                 status = "disabled";
  89                         };
  90
  91 -                       mdio {
  92 +                       mdio@72004 {
  93                                 #address-cells = <1>;
  94                                 #size-cells = <0>;
  95                                 compatible = "marvell,orion-mdio";
  96 --
  97 2.2.1
  98