ARM: mvebu: a38x: Fix node names

Some nodes in the DTs have a reg property but no unit name in their node name.

This contradicts the way the ePAPR defines the node names. Fix this.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>

diff --git a/arch/arm/boot/dts/armada-380.dtsi b/arch/arm/boot/dts/armada-380.dtsi
index 4173a8ab34e76a9d3a21bc50a73516379424ca47..13400ce88c54fa832508799e2e00a6c713b3f06d 100644 (file)
--- a/arch/arm/boot/dts/armada-380.dtsi
+++ b/arch/arm/boot/dts/armada-380.dtsi
@@ -32,7 +32,7 @@
 
        soc {
                internal-regs {
-                       pinctrl {
+                       pinctrl@18000 {
                                compatible = "marvell,mv88f6810-pinctrl";
                                reg = <0x18000 0x20>;
                        };

diff --git a/arch/arm/boot/dts/armada-385-db.dts b/arch/arm/boot/dts/armada-385-db.dts
index 2aaa9d2ac284121c39bdc91236b4c8dc95794b06..212605ccc7b6e9c68efefc5004098297f5802f89 100644 (file)
--- a/arch/arm/boot/dts/armada-385-db.dts
+++ b/arch/arm/boot/dts/armada-385-db.dts
@@ -74,7 +74,7 @@
                                phy-mode = "rgmii-id";
                        };
 
-                       mdio {
+                       mdio@72004 {
                                phy0: ethernet-phy@0 {
                                        reg = <0>;
                                };

diff --git a/arch/arm/boot/dts/armada-385-rd.dts b/arch/arm/boot/dts/armada-385-rd.dts
index aaca2861dc87aaeaad0ebc7b97bb2354ea99891b..74a3bfe6efd7c7fe4c6ecaa967def0587788bb8f 100644 (file)
--- a/arch/arm/boot/dts/armada-385-rd.dts
+++ b/arch/arm/boot/dts/armada-385-rd.dts
@@ -67,7 +67,7 @@
                        };
 
 
-                       mdio {
+                       mdio@72004 {
                                phy0: ethernet-phy@0 {
                                        reg = <0>;
                                };

diff --git a/arch/arm/boot/dts/armada-385.dtsi b/arch/arm/boot/dts/armada-385.dtsi
index 6283d7912f71b8e826117f3edd3bd26c67c059bc..5249a4d3c20777910939a191cbbfc59ed2123bbb 100644 (file)
--- a/arch/arm/boot/dts/armada-385.dtsi
+++ b/arch/arm/boot/dts/armada-385.dtsi
@@ -37,7 +37,7 @@
 
        soc {
                internal-regs {
-                       pinctrl {
+                       pinctrl@18000 {
                                compatible = "marvell,mv88f6820-pinctrl";
                                reg = <0x18000 0x20>;
                        };

diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index 74391dace9e74b6d0a49259ee8bbc33054a60525..ada1f206028b6be2d432af02b1461b2e9f11049d 100644 (file)
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -193,7 +193,7 @@
                                status = "disabled";
                        };
 
-                       pinctrl {
+                       pinctrl@18000 {
                                compatible = "marvell,mv88f6820-pinctrl";
                                reg = <0x18000 0x20>;
                        };
@@ -373,7 +373,7 @@
                                status = "disabled";
                        };
 
-                       mdio {
+                       mdio@72004 {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                compatible = "marvell,orion-mdio";