Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47295aa4 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'keystone-dts-fixes' of... 

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

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: default avatarOlof Johansson <olof@lixom.net>
parents e0ea1365 8b4769cc

arch/arm/boot/dts/k2e.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -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 @@ 
			ranges = <0x81000000 0 0 0x23260000 0x4000 0x4000

				0x82000000 0 0x60000000 0x60000000 0 0x10000000>;



			status = "disabled";

			device_type = "pci";

			num-lanes = <2>;

arch/arm/boot/dts/keystone.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ 
			ti,syscon-dev = <&devctrl 0x2a0>;

		};



		pcie@21800000 {

		pcie0: pcie@21800000 {

			compatible = "ti,keystone-pcie", "snps,dw-pcie";

			clocks = <&clkpcie>;

			clock-names = "pcie";
@@ -296,6 +296,7 @@ 
			ranges = <0x81000000 0 0 0x23250000 0 0x4000

				0x82000000 0 0x50000000 0x50000000 0 0x10000000>;



			status = "disabled";

			device_type = "pci";

			num-lanes = <2>;