ARM: dts: armada-370: Fixup pcie DT warnings

PCIe has a ranges property, so the unit name should contain an address.
Take the opportunity to use the node label instead of the full name.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
index d26115085ea1a093a2a9f0e04991915fba2b0201..f3adc187c6a5db0b3894bbea6350583d2657f724 100644 (file)
--- a/arch/arm/boot/dts/armada-370-db.dts
+++ b/arch/arm/boot/dts/armada-370-db.dts
@@ -170,24 +170,6 @@
                                };
                        };
                };
-
-               pcie-controller {
-                       status = "okay";
-                       /*
-                        * The two PCIe units are accessible through
-                        * both standard PCIe slots and mini-PCIe
-                        * slots on the board.
-                        */
-                       pcie@1,0 {
-                               /* Port 0, Lane 0 */
-                               status = "okay";
-                       };
-
-                       pcie@2,0 {
-                               /* Port 1, Lane 0 */
-                               status = "okay";
-                       };
-               };
        };
 
        sound {
@@ -248,6 +230,25 @@
                compatible = "linux,spdif-dir";
        };
 };
+
+&pciec {
+       status = "okay";
+       /*
+        * The two PCIe units are accessible through
+        * both standard PCIe slots and mini-PCIe
+        * slots on the board.
+        */
+       pcie@1,0 {
+               /* Port 0, Lane 0 */
+               status = "okay";
+       };
+
+       pcie@2,0 {
+               /* Port 1, Lane 0 */
+               status = "okay";
+       };
+};
+
 &mdio {
        pinctrl-0 = <&mdio_pins>;
        pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/armada-370-dlink-dns327l.dts b/arch/arm/boot/dts/armada-370-dlink-dns327l.dts
index e2a363b1dd8ad3778f361c0b93760f81d40995e8..9e499eeede4b7962e6484a5a6f77bef7d66e7e4d 100644 (file)
--- a/arch/arm/boot/dts/armada-370-dlink-dns327l.dts
+++ b/arch/arm/boot/dts/armada-370-dlink-dns327l.dts
@@ -72,20 +72,6 @@
                        MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000
                        MBUS_ID(0x09, 0x01) 0 0xf1100000 0x10000>;
 
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               /* Port 0, Lane 0 */
-                               status = "okay";
-                       };
-
-                       pcie@2,0 {
-                               /* Port 1, Lane 0 */
-                               status = "okay";
-                       };
-               };
-
                internal-regs {
                        sata@a0000 {
                                nr-ports = <2>;
@@ -262,6 +248,20 @@
        };
 };
 
+&pciec {
+       status = "okay";
+
+       pcie@1,0 {
+               /* Port 0, Lane 0 */
+               status = "okay";
+       };
+
+       pcie@2,0 {
+               /* Port 1, Lane 0 */
+               status = "okay";
+       };
+};
+
 &pinctrl {
        sata_l_white_pin: sata-l-white-pin {
                marvell,pins = "mpp57";

diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
index 3e1ef56b6319a6f91975fba7b465c178c2bb28d3..c4dded0cd0c174e4847c5544a82de6907bbf6506 100644 (file)
--- a/arch/arm/boot/dts/armada-370-mirabox.dts
+++ b/arch/arm/boot/dts/armada-370-mirabox.dts
@@ -64,22 +64,6 @@
                          MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000
                          MBUS_ID(0x09, 0x01) 0 0xf1100000 0x10000>;
 
-               pcie-controller {
-                       status = "okay";
-
-                       /* Internal mini-PCIe connector */
-                       pcie@1,0 {
-                               /* Port 0, Lane 0 */
-                               status = "okay";
-                       };
-
-                       /* Connected on the PCB to a USB 3.0 XHCI controller */
-                       pcie@2,0 {
-                               /* Port 1, Lane 0 */
-                               status = "okay";
-                       };
-               };
-
                internal-regs {
                        serial@12000 {
                                status = "okay";
@@ -186,6 +170,22 @@
        };
 };
 
+&pciec {
+       status = "okay";
+
+       /* Internal mini-PCIe connector */
+       pcie@1,0 {
+               /* Port 0, Lane 0 */
+               status = "okay";
+       };
+
+       /* Connected on the PCB to a USB 3.0 XHCI controller */
+       pcie@2,0 {
+               /* Port 1, Lane 0 */
+               status = "okay";
+       };
+};
+
 &mdio {
        pinctrl-0 = <&mdio_pins>;
        pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
index a6409853db6d7577c02d9d48cc4a738cccefa6f1..99b9d73ebbaf538ba00556055bca4b912e35fef2 100644 (file)
--- a/arch/arm/boot/dts/armada-370-netgear-rn102.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
@@ -66,22 +66,6 @@
                          MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000
                          MBUS_ID(0x09, 0x01) 0 0xf1100000 0x10000>;
 
-               pcie-controller {
-                       status = "okay";
-
-                       /* Connected to Marvell 88SE9170 SATA controller */
-                       pcie@1,0 {
-                               /* Port 0, Lane 0 */
-                               status = "okay";
-                       };
-
-                       /* Connected to FL1009 USB 3.0 controller */
-                       pcie@2,0 {
-                               /* Port 1, Lane 0 */
-                               status = "okay";
-                       };
-               };
-
                internal-regs {
 
                        /* RTC is provided by Intersil ISL12057 I2C RTC chip */
@@ -252,6 +236,22 @@
        };
 };
 
+&pciec {
+       status = "okay";
+
+       /* Connected to Marvell 88SE9170 SATA controller */
+       pcie@1,0 {
+               /* Port 0, Lane 0 */
+               status = "okay";
+       };
+
+       /* Connected to FL1009 USB 3.0 controller */
+       pcie@2,0 {
+               /* Port 1, Lane 0 */
+               status = "okay";
+       };
+};
+
 &mdio {
        pinctrl-0 = <&mdio_pins>;
        pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/armada-370-netgear-rn104.dts b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
index fd5f1d9a434aeff55fa55b11387e7f815f438470..b5dd301787253b255434e8013871632140fab864 100644 (file)
--- a/arch/arm/boot/dts/armada-370-netgear-rn104.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
@@ -66,22 +66,6 @@
                          MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000
                          MBUS_ID(0x09, 0x01) 0 0xf1100000 0x10000>;
 
-               pcie-controller {
-                       status = "okay";
-
-                       /* Connected to FL1009 USB 3.0 controller */
-                       pcie@1,0 {
-                               /* Port 0, Lane 0 */
-                               status = "okay";
-                       };
-
-                       /* Connected to Marvell 88SE9215 SATA controller */
-                       pcie@2,0 {
-                               /* Port 1, Lane 0 */
-                               status = "okay";
-                       };
-               };
-
                internal-regs {
 
                        /* RTC is provided by Intersil ISL12057 I2C RTC chip */
@@ -270,6 +254,22 @@
        };
 };
 
+&pciec {
+       status = "okay";
+
+       /* Connected to FL1009 USB 3.0 controller */
+       pcie@1,0 {
+               /* Port 0, Lane 0 */
+               status = "okay";
+       };
+
+       /* Connected to Marvell 88SE9215 SATA controller */
+       pcie@2,0 {
+               /* Port 1, Lane 0 */
+               status = "okay";
+       };
+};
+
 &mdio {
        pinctrl-0 = <&mdio_pins>;
        pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
index 621add7e12d5cc4dcc5c807bed52b4b623f92b88..29722b9f288e5898c0cf11d152a4e0cbb7cf57e3 100644 (file)
--- a/arch/arm/boot/dts/armada-370-rd.dts
+++ b/arch/arm/boot/dts/armada-370-rd.dts
@@ -77,22 +77,6 @@
                          MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000
                          MBUS_ID(0x09, 0x01) 0 0xf1100000 0x10000>;
 
-               pcie-controller {
-                       status = "okay";
-
-                       /* Internal mini-PCIe connector */
-                       pcie@1,0 {
-                               /* Port 0, Lane 0 */
-                               status = "okay";
-                       };
-
-                       /* Internal mini-PCIe connector */
-                       pcie@2,0 {
-                               /* Port 1, Lane 0 */
-                               status = "okay";
-                       };
-               };
-
                internal-regs {
                        serial@12000 {
                                status = "okay";
@@ -229,6 +213,22 @@
         };
 };
 
+&pciec {
+       status = "okay";
+
+       /* Internal mini-PCIe connector */
+       pcie@1,0 {
+               /* Port 0, Lane 0 */
+               status = "okay";
+       };
+
+       /* Internal mini-PCIe connector */
+       pcie@2,0 {
+               /* Port 1, Lane 0 */
+               status = "okay";
+       };
+};
+
 &mdio {
        pinctrl-0 = <&mdio_pins>;
        pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts b/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
index 82ce5ec6467b37ffa17c770f9f8ca5f5002fb243..eb6af53b4954156ff4fd91584d2c64c2f680d93c 100644 (file)
--- a/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
+++ b/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
@@ -28,13 +28,6 @@
        compatible = "seagate,dart-4", "marvell,armada370", "marvell,armada-370-xp";
 
        soc {
-               pcie-controller {
-                       /* SATA AHCI controller 88SE9170 */
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-
                internal-regs {
                        ethernet@74000 {
                                status = "okay";
@@ -126,6 +119,13 @@
        };
 };
 
+&pciec {
+       /* SATA AHCI controller 88SE9170 */
+       pcie@1,0 {
+               status = "okay";
+       };
+};
+
 &mdio {
        phy1: ethernet-phy@1 {
                reg = <1>;

diff --git a/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi b/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
index 724a47908e3f6e259d32588dd3c44d42046c0c6e..9b582c47f10cf81a08c9d06828a41d7fc5c71c22 100644 (file)
--- a/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
+++ b/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
@@ -32,15 +32,6 @@
                ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
                          MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;
 
-               pcie-controller {
-                       status = "okay";
-
-                       /* USB 3.0 bridge ASM1042A */
-                       pcie@2,0 {
-                               status = "okay";
-                       };
-               };
-
                internal-regs {
                        serial@12000 {
                                status = "okay";
@@ -199,6 +190,16 @@
        };
 };
 
+&pciec {
+       status = "okay";
+
+       /* USB 3.0 bridge ASM1042A */
+       pcie@2,0 {
+               status = "okay";
+       };
+};
+
+
 &mdio {
        pinctrl-0 = <&mdio_pins>;
        pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
index fb52a34f0a3501ab86ad420e18fc2344d2206349..bb678a45ac8e11669bd2b810946226b01dd3af21 100644 (file)
--- a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
+++ b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
@@ -33,15 +33,6 @@
                ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
                          MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;
 
-               pcie-controller {
-                       status = "okay";
-
-                       /* USB 3.0 Bridge ASM1042A */
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-
                internal-regs {
                        coherency-fabric@20200 {
                                broken-idle;
@@ -134,6 +125,15 @@
        };
 };
 
+&pciec {
+       status = "okay";
+
+       /* USB 3.0 Bridge ASM1042A */
+       pcie@1,0 {
+               status = "okay";
+       };
+};
+
 &mdio {
        pinctrl-0 = <&mdio_pins>;
        pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index 079494e525542b5824fd892c354e9d395a187366..60cdeb35f117f926380e4e133dfe53b8c1b68ae5 100644 (file)
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -70,7 +70,7 @@
                        reg = <MBUS_ID(0x01, 0xe0) 0 0x100000>;
                };
 
-               pciec: pcie-controller {
+               pciec: pcie-controller@82000000 {
                        compatible = "marvell,armada-370-pcie";
                        status = "disabled";
                        device_type = "pci";