Merge tag 'keystone-dts-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ssant...

Merge "ARM: Couple of dts fixes for v4.2-rcx" from Santosh Shilimkar:

Couple of DTS fixes 4.2-rcx for Keystone EVMs:

K2E EVM boot hangs because of missing serdes driver which is needed to bring up
PCIe on K2E. These couple of fixes makes the PCIE disabled on common default and
let the specific board DTS to enable it.

* tag 'keystone-dts-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: keystone: dts: rename pcie nodes to help override status
  ARM: keystone: dts: fix dt bindings for PCIe

Signed-off-by: Olof Johansson <[email protected]>

diff --combined arch/arm/boot/dts/k2e.dtsi
index 50e555eab50d98e971014e57ed8611df5a07a007,2bc7b13e5f9addd79321233932b9d3d62330659c..1b6494fbdb91b9301c607652efbd9a9fb34a9f36
--- 1/arch/arm/boot/dts/k2e.dtsi
--- 2/arch/arm/boot/dts/k2e.dtsi
+++ b/arch/arm/boot/dts/k2e.dtsi
@@@ -86,7 -86,7 +86,7 @@@
                        gpio,syscon-dev = <&devctrl 0x240>;
                };
  
-               pcie@21020000 {
+               pcie1: pcie@21020000 {
                        compatible = "ti,keystone-pcie","snps,dw-pcie";
                        clocks = <&clkpcie1>;
                        clock-names = "pcie";
@@@ -96,6 -96,7 +96,7 @@@
                        ranges = <0x81000000 0 0 0x23260000 0x4000 0x4000
                                0x82000000 0 0x60000000 0x60000000 0 0x10000000>;
  
+                       status = "disabled";
                        device_type = "pci";
                        num-lanes = <2>;
  
@@@ -130,7 -131,6 +131,7 @@@
                                        <GIC_SPI 376 IRQ_TYPE_EDGE_RISING>;
                        };
                };
 +              /include/ "k2e-netcp.dtsi"
        };
  };