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

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

diff --git a/arch/arm/boot/dts/kirkwood-synology.dtsi b/arch/arm/boot/dts/kirkwood-synology.dtsi
index 04015c174b990ed764fa18f3230b43e47c9c17b9..65e9524e852ab0570e72330fc8a5eabfb4fe173f 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-synology.dtsi
+++ b/arch/arm/boot/dts/kirkwood-synology.dtsi
@@ -10,20 +10,6 @@
  */
 
 / {
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-
-                       pcie2: pcie@2,0 {
-                               status = "disabled";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
                        pmx_alarmled_12: pmx-alarmled-12 {
@@ -861,3 +847,11 @@
                phy-handle = <&ethphy1>;
        };
 };
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};