ARM: dts: NSP: Fix PCIE DT issue

Adding the ranges value is preventing the PCI nodes from working.
Pulling them out outside makes them work again (and makes it similar to
the NS2 device tree).

Signed-off-by: Jon Mason <jonmason@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
index 49f9376d0d1210133da0a76d0341b21256707138..3b8c2c09286f3c33b4693e32d9e659c9bcc433f4 100644 (file)
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -197,78 +197,6 @@
                        status = "disabled";
                };
 
-               pcie0: pcie@12000 {
-                       compatible = "brcm,iproc-pcie";
-                       reg = <0x12000 0x1000>;
-
-                       #interrupt-cells = <1>;
-                       interrupt-map-mask = <0 0 0 0>;
-                       interrupt-map = <0 0 0 0 &gic GIC_SPI 131 IRQ_TYPE_NONE>;
-
-                       linux,pci-domain = <0>;
-
-                       bus-range = <0x00 0xff>;
-
-                       #address-cells = <3>;
-                       #size-cells = <2>;
-                       device_type = "pci";
-
-                       /* Note: The HW does not support I/O resources.  So,
-                        * only the memory resource range is being specified.
-                        */
-                       ranges = <0x82000000 0 0x08000000 0x08000000 0 0x8000000>;
-
-                       status = "disabled";
-               };
-
-               pcie1: pcie@13000 {
-                       compatible = "brcm,iproc-pcie";
-                       reg = <0x13000 0x1000>;
-
-                       #interrupt-cells = <1>;
-                       interrupt-map-mask = <0 0 0 0>;
-                       interrupt-map = <0 0 0 0 &gic GIC_SPI 137 IRQ_TYPE_NONE>;
-
-                       linux,pci-domain = <1>;
-
-                       bus-range = <0x00 0xff>;
-
-                       #address-cells = <3>;
-                       #size-cells = <2>;
-                       device_type = "pci";
-
-                       /* Note: The HW does not support I/O resources.  So,
-                        * only the memory resource range is being specified.
-                        */
-                       ranges = <0x82000000 0 0x40000000 0x40000000 0 0x8000000>;
-
-                       status = "disabled";
-               };
-
-               pcie2: pcie@14000 {
-                       compatible = "brcm,iproc-pcie";
-                       reg = <0x14000 0x1000>;
-
-                       #interrupt-cells = <1>;
-                       interrupt-map-mask = <0 0 0 0>;
-                       interrupt-map = <0 0 0 0 &gic GIC_SPI 143 IRQ_TYPE_NONE>;
-
-                       linux,pci-domain = <2>;
-
-                       bus-range = <0x00 0xff>;
-
-                       #address-cells = <3>;
-                       #size-cells = <2>;
-                       device_type = "pci";
-
-                       /* Note: The HW does not support I/O resources.  So,
-                        * only the memory resource range is being specified.
-                        */
-                       ranges = <0x82000000 0 0x48000000 0x48000000 0 0x8000000>;
-
-                       status = "disabled";
-               };
-
                nand: nand@26000 {
                        compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
                        reg = <0x026000 0x600>,
@@ -318,4 +246,76 @@
                              <0x3f408 0x04>;
                };
        };
+
+       pcie0: pcie@18012000 {
+               compatible = "brcm,iproc-pcie";
+               reg = <0x18012000 0x1000>;
+
+               #interrupt-cells = <1>;
+               interrupt-map-mask = <0 0 0 0>;
+               interrupt-map = <0 0 0 0 &gic GIC_SPI 131 IRQ_TYPE_NONE>;
+
+               linux,pci-domain = <0>;
+
+               bus-range = <0x00 0xff>;
+
+               #address-cells = <3>;
+               #size-cells = <2>;
+               device_type = "pci";
+
+               /* Note: The HW does not support I/O resources.  So,
+                * only the memory resource range is being specified.
+                */
+               ranges = <0x82000000 0 0x08000000 0x08000000 0 0x8000000>;
+
+               status = "disabled";
+       };
+
+       pcie1: pcie@18013000 {
+               compatible = "brcm,iproc-pcie";
+               reg = <0x18013000 0x1000>;
+
+               #interrupt-cells = <1>;
+               interrupt-map-mask = <0 0 0 0>;
+               interrupt-map = <0 0 0 0 &gic GIC_SPI 137 IRQ_TYPE_NONE>;
+
+               linux,pci-domain = <1>;
+
+               bus-range = <0x00 0xff>;
+
+               #address-cells = <3>;
+               #size-cells = <2>;
+               device_type = "pci";
+
+               /* Note: The HW does not support I/O resources.  So,
+                * only the memory resource range is being specified.
+                */
+               ranges = <0x82000000 0 0x40000000 0x40000000 0 0x8000000>;
+
+               status = "disabled";
+       };
+
+       pcie2: pcie@18014000 {
+               compatible = "brcm,iproc-pcie";
+               reg = <0x18014000 0x1000>;
+
+               #interrupt-cells = <1>;
+               interrupt-map-mask = <0 0 0 0>;
+               interrupt-map = <0 0 0 0 &gic GIC_SPI 143 IRQ_TYPE_NONE>;
+
+               linux,pci-domain = <2>;
+
+               bus-range = <0x00 0xff>;
+
+               #address-cells = <3>;
+               #size-cells = <2>;
+               device_type = "pci";
+
+               /* Note: The HW does not support I/O resources.  So,
+                * only the memory resource range is being specified.
+                */
+               ranges = <0x82000000 0 0x48000000 0x48000000 0 0x8000000>;
+
+               status = "disabled";
+       };
 };