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

PCIe has a range 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-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
index 7038c86..d12b06b 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
+++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
@@ -73,28 +73,6 @@
                          MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
                          MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
 
-               pcie-controller {
-                       status = "okay";
-
-                       /* First mini-PCIe port */
-                       pcie@1,0 {
-                               /* Port 0, Lane 0 */
-                               status = "okay";
-                       };
-
-                       /* Second mini-PCIe port */
-                       pcie@2,0 {
-                               /* Port 0, Lane 1 */
-                               status = "okay";
-                       };
-
-                       /* Renesas uPD720202 USB 3.0 controller */
-                       pcie@3,0 {
-                               /* Port 0, Lane 3 */
-                               status = "okay";
-                       };
-               };
-
                internal-regs {
                        /* UART0 */
                        serial@12000 {
@@ -153,6 +131,28 @@
        };
 };
 
+&pciec {
+       status = "okay";
+
+       /* First mini-PCIe port */
+       pcie@1,0 {
+               /* Port 0, Lane 0 */
+               status = "okay";
+       };
+
+       /* Second mini-PCIe port */
+       pcie@2,0 {
+               /* Port 0, Lane 1 */
+               status = "okay";
+       };
+
+       /* Renesas uPD720202 USB 3.0 controller */
+       pcie@3,0 {
+               /* Port 0, Lane 3 */
+               status = "okay";
+       };
+};
+
 &pinctrl {
        pinctrl-0 = <&phy_int_pin>;
        pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts
index 665c81f..8b9c606 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@ -108,39 +108,6 @@
                        };
                };
 
-               pcie-controller {
-                       status = "okay";
-
-                       /*
-                        * All 6 slots are physically present as
-                        * standard PCIe slots on the board.
-                        */
-                       pcie@1,0 {
-                               /* Port 0, Lane 0 */
-                               status = "okay";
-                       };
-                       pcie@2,0 {
-                               /* Port 0, Lane 1 */
-                               status = "okay";
-                       };
-                       pcie@3,0 {
-                               /* Port 0, Lane 2 */
-                               status = "okay";
-                       };
-                       pcie@4,0 {
-                               /* Port 0, Lane 3 */
-                               status = "okay";
-                       };
-                       pcie@9,0 {
-                               /* Port 2, Lane 0 */
-                               status = "okay";
-                       };
-                       pcie@10,0 {
-                               /* Port 3, Lane 0 */
-                               status = "okay";
-                       };
-               };
-
                internal-regs {
                        serial@12000 {
                                status = "okay";
@@ -248,6 +215,39 @@
        };
 };
 
+&pciec {
+       status = "okay";
+
+       /*
+        * All 6 slots are physically present as
+        * standard PCIe slots on the board.
+        */
+       pcie@1,0 {
+               /* Port 0, Lane 0 */
+               status = "okay";
+       };
+       pcie@2,0 {
+               /* Port 0, Lane 1 */
+               status = "okay";
+       };
+       pcie@3,0 {
+               /* Port 0, Lane 2 */
+               status = "okay";
+       };
+       pcie@4,0 {
+               /* Port 0, Lane 3 */
+               status = "okay";
+       };
+       pcie@9,0 {
+               /* Port 2, Lane 0 */
+               status = "okay";
+       };
+       pcie@10,0 {
+               /* Port 3, Lane 0 */
+               status = "okay";
+       };
+};
+
 &mdio {
        phy0: ethernet-phy@0 {
                reg = <0>;

diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
index 09c9cab..fca37e9 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-gp.dts
+++ b/arch/arm/boot/dts/armada-xp-gp.dts
@@ -127,27 +127,6 @@
                        };
                };
 
-               pcie-controller {
-                       status = "okay";
-
-                       /*
-                        * The 3 slots are physically present as
-                        * standard PCIe slots on the board.
-                        */
-                       pcie@1,0 {
-                               /* Port 0, Lane 0 */
-                               status = "okay";
-                       };
-                       pcie@9,0 {
-                               /* Port 2, Lane 0 */
-                               status = "okay";
-                       };
-                       pcie@10,0 {
-                               /* Port 3, Lane 0 */
-                               status = "okay";
-                       };
-               };
-
                internal-regs {
                        serial@12000 {
                                status = "okay";
@@ -233,6 +212,27 @@
        };
 };
 
+&pciec {
+       status = "okay";
+
+       /*
+        * The 3 slots are physically present as
+        * standard PCIe slots on the board.
+        */
+       pcie@1,0 {
+               /* Port 0, Lane 0 */
+               status = "okay";
+       };
+       pcie@9,0 {
+               /* Port 2, Lane 0 */
+               status = "okay";
+       };
+       pcie@10,0 {
+               /* Port 3, Lane 0 */
+               status = "okay";
+       };
+};
+
 &mdio {
        phy0: ethernet-phy@0 {
                reg = <16>;

diff --git a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
index 0a6a436..1dce74d 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
+++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
@@ -68,22 +68,6 @@
                        MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
                        MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
 
-               pcie-controller {
-                       status = "okay";
-
-                       /* Quad port sata: Marvell 88SX7042 */
-                       pcie@1,0 {
-                               /* Port 0, Lane 0 */
-                               status = "okay";
-                       };
-
-                       /* USB 3.0 xHCI controller: NEC D720200F1 */
-                       pcie@5,0 {
-                               /* Port 1, Lane 0 */
-                               status = "okay";
-                       };
-               };
-
                internal-regs {
                        serial@12000 {
                                status = "okay";
@@ -285,6 +269,21 @@
                gpios = <&gpio0 24 GPIO_ACTIVE_HIGH>;
        };
 };
+&pciec {
+       status = "okay";
+
+       /* Quad port sata: Marvell 88SX7042 */
+       pcie@1,0 {
+               /* Port 0, Lane 0 */
+               status = "okay";
+       };
+
+       /* USB 3.0 xHCI controller: NEC D720200F1 */
+       pcie@5,0 {
+               /* Port 1, Lane 0 */
+               status = "okay";
+       };
+};
 
 &mdio {
        phy0: ethernet-phy@0 { /* Marvell 88E1318 */

diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
index 076f27f..488a047 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
@@ -73,28 +73,6 @@
                          MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
                          MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
 
-               pcie-controller {
-                       status = "okay";
-
-                       /* Etron EJ168 USB 3.0 controller */
-                       pcie@1,0 {
-                               /* Port 0, Lane 0 */
-                               status = "okay";
-                       };
-
-                       /* First mini-PCIe port */
-                       pcie@2,0 {
-                               /* Port 0, Lane 1 */
-                               status = "okay";
-                       };
-
-                       /* Second mini-PCIe port */
-                       pcie@3,0 {
-                               /* Port 0, Lane 3 */
-                               status = "okay";
-                       };
-               };
-
                internal-regs {
 
                        rtc@10300 {
@@ -369,6 +347,28 @@
        };
 };
 
+&pciec {
+       status = "okay";
+
+       /* Etron EJ168 USB 3.0 controller */
+       pcie@1,0 {
+               /* Port 0, Lane 0 */
+               status = "okay";
+       };
+
+       /* First mini-PCIe port */
+       pcie@2,0 {
+               /* Port 0, Lane 1 */
+               status = "okay";
+       };
+
+       /* Second mini-PCIe port */
+       pcie@3,0 {
+               /* Port 0, Lane 3 */
+               status = "okay";
+       };
+};
+
 &pinctrl {
 
        keys_pin: keys-pin {

diff --git a/arch/arm/boot/dts/armada-xp-matrix.dts b/arch/arm/boot/dts/armada-xp-matrix.dts
index e1509f4..8b5a4e7 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-matrix.dts
+++ b/arch/arm/boot/dts/armada-xp-matrix.dts
@@ -71,15 +71,6 @@
                          MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
                          MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
 
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               /* Port 0, Lane 0 */
-                               status = "okay";
-                       };
-               };
-
                internal-regs {
                        serial@12000 {
                                status = "okay";
@@ -114,3 +105,12 @@
                };
        };
 };
+
+&pciec {
+       status = "okay";
+
+       pcie@1,0 {
+               /* Port 0, Lane 0 */
+               status = "okay";
+       };
+};

diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
index ebf79d6..05c164b 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
@@ -86,7 +86,7 @@
                 * configured as x4 or quad x1 lanes. One unit is
                 * x1 only.
                 */
-               pciec: pcie-controller {
+               pciec: pcie-controller@82000000 {
                        compatible = "marvell,armada-xp-pcie";
                        status = "disabled";
                        device_type = "pci";

diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
index 34e78a5..07894b0 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
@@ -87,7 +87,7 @@
                 * configured as x4 or quad x1 lanes. One unit is
                 * x4 only.
                 */
-               pciec: pcie-controller {
+               pciec: pcie-controller@82000000 {
                        compatible = "marvell,armada-xp-pcie";
                        status = "disabled";
                        device_type = "pci";

diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
index 5148827..775bee5 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
@@ -104,7 +104,7 @@
                 * configured as x4 or quad x1 lanes. Two units are
                 * x4/x1.
                 */
-               pciec: pcie-controller {
+               pciec: pcie-controller@82000000 {
                        compatible = "marvell,armada-xp-pcie";
                        status = "disabled";
                        device_type = "pci";

diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
index c4685cb..5aaaf0f 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
+++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
@@ -67,28 +67,6 @@
                          MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
                          MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
 
-               pcie-controller {
-                       status = "okay";
-
-                       /* Connected to first Marvell 88SE9170 SATA controller */
-                       pcie@1,0 {
-                               /* Port 0, Lane 0 */
-                               status = "okay";
-                       };
-
-                       /* Connected to second Marvell 88SE9170 SATA controller */
-                       pcie@2,0 {
-                               /* Port 0, Lane 1 */
-                               status = "okay";
-                       };
-
-                       /* Connected to Fresco Logic FL1009 USB 3.0 controller */
-                       pcie@5,0 {
-                               /* Port 1, Lane 0 */
-                               status = "okay";
-                       };
-               };
-
                internal-regs {
 
                        /* RTC is provided by Intersil ISL12057 I2C RTC chip */
@@ -290,6 +268,28 @@
        };
 };
 
+&pciec {
+       status = "okay";
+
+       /* Connected to first Marvell 88SE9170 SATA controller */
+       pcie@1,0 {
+               /* Port 0, Lane 0 */
+               status = "okay";
+       };
+
+       /* Connected to second Marvell 88SE9170 SATA controller */
+       pcie@2,0 {
+               /* Port 0, Lane 1 */
+               status = "okay";
+       };
+
+       /* Connected to Fresco Logic FL1009 USB 3.0 controller */
+       pcie@5,0 {
+               /* Port 1, Lane 0 */
+               status = "okay";
+       };
+};
+
 &mdio {
        phy0: ethernet-phy@0 { /* Marvell 88E1318 */
                reg = <0>;

diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index 2e2cd93..a0e36e1 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -98,15 +98,6 @@
                        };
                };
 
-               pcie-controller {
-                       status = "okay";
-                       /* Internal mini-PCIe connector */
-                       pcie@1,0 {
-                               /* Port 0, Lane 0 */
-                               status = "okay";
-                       };
-               };
-
                internal-regs {
                        rtc@10300 {
                                /* No crystal connected to the internal RTC */
@@ -222,6 +213,15 @@
        };
 };
 
+&pciec {
+       status = "okay";
+       /* Internal mini-PCIe connector */
+       pcie@1,0 {
+               /* Port 0, Lane 0 */
+               status = "okay";
+       };
+};
+
 &mdio {
        phy0: ethernet-phy@0 {
                reg = <0>;

diff --git a/arch/arm/boot/dts/armada-xp-synology-ds414.dts b/arch/arm/boot/dts/armada-xp-synology-ds414.dts
index 189ec7f..d5630a7 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-synology-ds414.dts
+++ b/arch/arm/boot/dts/armada-xp-synology-ds414.dts
@@ -81,28 +81,6 @@
                          MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
                          MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
 
-               pcie-controller {
-                       status = "okay";
-
-                       /*
-                        * Connected to Marvell 88SX7042 SATA-II controller
-                        * handling the four disks.
-                        */
-                       pcie@1,0 {
-                               /* Port 0, Lane 0 */
-                               status = "okay";
-                       };
-
-                       /*
-                        * Connected to EtronTech EJ168A XHCI controller
-                        * providing the two rear USB 3.0 ports.
-                        */
-                       pcie@5,0 {
-                               /* Port 1, Lane 0 */
-                               status = "okay";
-                       };
-               };
-
                internal-regs {
 
                        /* RTC is provided by Seiko S-35390A below */
@@ -230,6 +208,29 @@
        };
 };
 
+&pciec {
+       status = "okay";
+
+       /*
+        * Connected to Marvell 88SX7042 SATA-II controller
+        * handling the four disks.
+        */
+       pcie@1,0 {
+               /* Port 0, Lane 0 */
+               status = "okay";
+       };
+
+       /*
+        * Connected to EtronTech EJ168A XHCI controller
+        * providing the two rear USB 3.0 ports.
+        */
+       pcie@5,0 {
+               /* Port 1, Lane 0 */
+               status = "okay";
+       };
+};
+
+
 &mdio {
        phy0: ethernet-phy@0 { /* Marvell 88E1512 */
                reg = <0>;