arm64: dts: move juno pcie-controller to base file

The PCIe controller is found on all Juno SoC version. However it's not
functional on R0 due to some hardware bug.

In preparation to add Juno R2 support, this patch moves the
pcie-controller defination to base DTS file. It's marked as disabled by
default and is enabled for Juno R1 explicitly.

Acked-by: Liviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index dd5158eb5872396693bba678cda765a719e25e97..b501721baf77e088e9510e2c2a136d9e4202addc 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -75,6 +75,28 @@
                };
        };
 
+       pcie_ctlr: pcie-controller@40000000 {
+               compatible = "arm,juno-r1-pcie", "plda,xpressrich3-axi", "pci-host-ecam-generic";
+               device_type = "pci";
+               reg = <0 0x40000000 0 0x10000000>;      /* ECAM config space */
+               bus-range = <0 255>;
+               linux,pci-domain = <0>;
+               #address-cells = <3>;
+               #size-cells = <2>;
+               dma-coherent;
+               ranges = <0x01000000 0x00 0x5f800000 0x00 0x5f800000 0x0 0x00800000>,
+                        <0x02000000 0x00 0x50000000 0x00 0x50000000 0x0 0x08000000>,
+                        <0x42000000 0x40 0x00000000 0x40 0x00000000 0x1 0x00000000>;
+               #interrupt-cells = <1>;
+               interrupt-map-mask = <0 0 0 7>;
+               interrupt-map = <0 0 0 1 &gic 0 0 0 136 4>,
+                               <0 0 0 2 &gic 0 0 0 137 4>,
+                               <0 0 0 3 &gic 0 0 0 138 4>,
+                               <0 0 0 4 &gic 0 0 0 139 4>;
+               msi-parent = <&v2m_0>;
+               status = "disabled";
+       };
+
        scpi {
                compatible = "arm,scpi";
                mboxes = <&mailbox 1>;

diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts
index 8826f834f54f25ca1b1912e9903af68d8c37453b..d95d9e7e2dc0899eb5201c7f49316c1e26003356 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-r1.dts
+++ b/arch/arm64/boot/dts/arm/juno-r1.dts
@@ -172,29 +172,12 @@
        };
 
        #include "juno-base.dtsi"
-
-       pcie-controller@40000000 {
-               compatible = "arm,juno-r1-pcie", "plda,xpressrich3-axi", "pci-host-ecam-generic";
-               device_type = "pci";
-               reg = <0 0x40000000 0 0x10000000>;      /* ECAM config space */
-               bus-range = <0 255>;
-               linux,pci-domain = <0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               dma-coherent;
-               ranges = <0x01000000 0x00 0x5f800000 0x00 0x5f800000 0x0 0x00800000>,
-                        <0x02000000 0x00 0x50000000 0x00 0x50000000 0x0 0x08000000>,
-                        <0x42000000 0x40 0x00000000 0x40 0x00000000 0x1 0x00000000>;
-               #interrupt-cells = <1>;
-               interrupt-map-mask = <0 0 0 7>;
-               interrupt-map = <0 0 0 1 &gic 0 0 0 136 4>,
-                               <0 0 0 2 &gic 0 0 0 137 4>,
-                               <0 0 0 3 &gic 0 0 0 138 4>,
-                               <0 0 0 4 &gic 0 0 0 139 4>;
-               msi-parent = <&v2m_0>;
-       };
 };
 
 &memtimer {
        status = "okay";
 };
+
+&pcie_ctlr {
+       status = "okay";
+};