aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
diff options
context:
space:
mode:
authorSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2014-04-30 14:56:28 +0200
committerJason Cooper <jason@lakedaemon.net>2014-05-05 00:43:15 +0000
commit788296b2d19d16ec33aba0a5ad1544d50bb58601 (patch)
tree113b4197e3b2c6db54cb7897fa08a6ba687f3574 /arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
parente247686085f71e9c25e3488ce83d5d0f77023438 (diff)
downloadlinux-stericsson-788296b2d19d16ec33aba0a5ad1544d50bb58601.tar.gz
ARM: dts: kirkwood: fix mislocated pcie-controller nodes
Commit 54397d85349f ("ARM: kirkwood: Relocate PCIe device tree nodes") moved the pcie-controller nodes for the Kirkwood SoCs to the mbus bus node. For some reason, two boards were not properly converted and have their pci-controller nodes still in the ocp bus node. As the corresponding SoC pcie-controller does not exist anymore, it is likely that pcie is broken on those boards since above commit. Fix it by moving the pcie related nodes to the correct location. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Fixes: 54397d85349f ("ARM: kirkwood: Relocate PCIe device tree nodes") Cc: <stable@vger.kernel.org> # v3.12+ Acked-by: Andrew Lunn <andrew@lunn.ch> Link: https://lkml.kernel.org/r/1398862602-29595-2-git-send-email-sebastian.hesselbarth@gmail.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts')
-rw-r--r--arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts18
1 files changed, 10 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
index 2cb0dc529165..4bf358c28be2 100644
--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@ -30,6 +30,16 @@
bootargs = "console=ttyS0,115200n8 earlyprintk";
};
+ mbus {
+ pcie-controller {
+ status = "okay";
+
+ pcie@1,0 {
+ status = "okay";
+ };
+ };
+ };
+
ocp@f1000000 {
pinctrl@10000 {
pmx_usb_led: pmx-usb-led {
@@ -73,14 +83,6 @@
ehci@50000 {
status = "okay";
};
-
- pcie-controller {
- status = "okay";
-
- pcie@1,0 {
- status = "okay";
- };
- };
};
gpio-leds {