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

[deliverable/linux.git] / arch / arm / boot / dts / kirkwood-db-88f6282.dts

diff --git a/arch/arm/boot/dts/kirkwood-db-88f6282.dts b/arch/arm/boot/dts/kirkwood-db-88f6282.dts
index 701c6b6cdaa2ffd82b49ac2a0fe145e1e9d626a5..e8b23e13ec0c935dd6d86371dfb54a57e0b0df48 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-db-88f6282.dts
+++ b/arch/arm/boot/dts/kirkwood-db-88f6282.dts
@@ -17,18 +17,16 @@
 / {
        model = "Marvell DB-88F6282-BP Development Board";
        compatible = "marvell,db-88f6282-bp", "marvell,kirkwood-88f6282", "marvell,kirkwood";
+};
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
+&pciec {
+        status = "okay";
+};
 
-                       pcie@1,0 {
-                               status = "okay";
-                       };
+&pcie0 {
+       status = "okay";
+};
 
-                       pcie@2,0 {
-                               status = "okay";
-                       };
-               };
-       };
+&pcie1 {
+       status = "okay";
 };