diff options
| author | Mark Brown <broonie@kernel.org> | 2015-08-22 00:26:37 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-22 00:26:37 +0200 |
| commit | d033de5ceee8333e4fee3d59a956244d3736102a (patch) | |
| tree | 5bdebcac18ed67890571632570c324e0c41a7223 /arch/arm/boot/dts/k2e.dtsi | |
| parent | ASoC: topology: Change pass number of DAI smaller than graph (diff) | |
| parent | Linux 4.2-rc6 (diff) | |
| download | linux-d033de5ceee8333e4fee3d59a956244d3736102a.tar.xz linux-d033de5ceee8333e4fee3d59a956244d3736102a.zip | |
Merge tag 'v4.2-rc6' into asoc-topology
Linux 4.2-rc6
Diffstat (limited to 'arch/arm/boot/dts/k2e.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/k2e.dtsi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/k2e.dtsi b/arch/arm/boot/dts/k2e.dtsi index 50e555eab50d..1b6494fbdb91 100644 --- a/arch/arm/boot/dts/k2e.dtsi +++ b/arch/arm/boot/dts/k2e.dtsi @@ -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>; |