aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-05-10 20:22:29 -0700
committerOlof Johansson <olof@lixom.net>2014-05-10 20:22:29 -0700
commite5e49fe9dfe33beabd0af593870cc9247ba481a6 (patch)
tree4587113322d99b4e473694a0c6e58a2dcf648a55 /arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
parent90f4c5944b38b4647373db7a57a2dda1e0c5566a (diff)
parent788296b2d19d16ec33aba0a5ad1544d50bb58601 (diff)
downloadlinux-stericsson-e5e49fe9dfe33beabd0af593870cc9247ba481a6.tar.gz
Merge tag 'mvebu-dt-fixes-3.15-2' of git://git.infradead.org/linux-mvebu into fixes
Merge 'ARM: mvebu: DT fixes for v3.15 (incr #2)' from Jason Cooper: mvebu DT fixes for v3.15 (incremental #2) - kirkwood: fix mis-located pcie controller nodes * tag 'mvebu-dt-fixes-3.15-2' of git://git.infradead.org/linux-mvebu: ARM: dts: kirkwood: fix mislocated pcie-controller nodes Signed-off-by: Olof Johansson <olof@lixom.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 32c6fb4a1162..b939f4f52d16 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 {