Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[deliverable/linux.git] / arch / arm / boot / dts / kirkwood-openrd.dtsi

diff --git a/arch/arm/boot/dts/kirkwood-openrd.dtsi b/arch/arm/boot/dts/kirkwood-openrd.dtsi
index 24f1d30970a0650b535bcd67395c0cea8ace7935..e4ecab1126011f220601ed7f31e931ec6336bebb 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-openrd.dtsi
+++ b/arch/arm/boot/dts/kirkwood-openrd.dtsi
@@ -25,16 +25,6 @@
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
                        pinctrl-0 = <&pmx_select28 &pmx_sdio_cd &pmx_select34>;
@@ -125,3 +115,7 @@
                reg = <0x0600000 0x1FA00000>;
        };
 };
+
+&pcie0 {
+       status = "okay";
+};