Merge tag 'davinci-for-v4.7/dt-part2' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / kirkwood-ts219.dtsi

diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
index 0e46560551f44b5d5dba4a01dcd74d9eb91ec5b2..62e5e2d5c348c864fb57fa7a1bcec712f7a1093a 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -12,16 +12,6 @@
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                i2c@11000 {
                        status = "okay";
@@ -94,7 +84,7 @@
 &mdio {
        status = "okay";
 
-       ethphy0: ethernet-phy {
+       ethphy0: ethernet-phy@X {
                 /* overwrite reg property in board file */
        };
 };
@@ -105,3 +95,11 @@
                phy-handle = <&ethphy0>;
        };
 };
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};