mvebu: add a coherency fix which didn't make it to -stable, yet
[openwrt.git] / 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 --- a/arch/arm/boot/dts/armada-380.dtsi
23 +++ b/arch/arm/boot/dts/armada-380.dtsi
24 @@ -32,7 +32,7 @@
25  
26         soc {
27                 internal-regs {
28 -                       pinctrl {
29 +                       pinctrl@18000 {
30                                 compatible = "marvell,mv88f6810-pinctrl";
31                                 reg = <0x18000 0x20>;
32                         };
33 --- a/arch/arm/boot/dts/armada-385-db.dts
34 +++ b/arch/arm/boot/dts/armada-385-db.dts
35 @@ -74,7 +74,7 @@
36                                 phy-mode = "rgmii-id";
37                         };
38  
39 -                       mdio {
40 +                       mdio@72004 {
41                                 phy0: ethernet-phy@0 {
42                                         reg = <0>;
43                                 };
44 --- a/arch/arm/boot/dts/armada-385-rd.dts
45 +++ b/arch/arm/boot/dts/armada-385-rd.dts
46 @@ -67,7 +67,7 @@
47                         };
48  
49  
50 -                       mdio {
51 +                       mdio@72004 {
52                                 phy0: ethernet-phy@0 {
53                                         reg = <0>;
54                                 };
55 --- a/arch/arm/boot/dts/armada-385.dtsi
56 +++ b/arch/arm/boot/dts/armada-385.dtsi
57 @@ -37,7 +37,7 @@
58  
59         soc {
60                 internal-regs {
61 -                       pinctrl {
62 +                       pinctrl@18000 {
63                                 compatible = "marvell,mv88f6820-pinctrl";
64                                 reg = <0x18000 0x20>;
65                         };
66 --- a/arch/arm/boot/dts/armada-38x.dtsi
67 +++ b/arch/arm/boot/dts/armada-38x.dtsi
68 @@ -193,7 +193,7 @@
69                                 status = "disabled";
70                         };
71  
72 -                       pinctrl {
73 +                       pinctrl@18000 {
74                                 compatible = "marvell,mv88f6820-pinctrl";
75                                 reg = <0x18000 0x20>;
76  
77 @@ -412,7 +412,7 @@
78                                 status = "disabled";
79                         };
80  
81 -                       mdio {
82 +                       mdio@72004 {
83                                 #address-cells = <1>;
84                                 #size-cells = <0>;
85                                 compatible = "marvell,orion-mdio";