Merge tag 'clk-for-linus-3.12' of git://git.linaro.org/people/mturquette/linux

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / kirkwood-db.dtsi

diff --git a/arch/arm/boot/dts/kirkwood-db.dtsi b/arch/arm/boot/dts/kirkwood-db.dtsi
index c87cfb8161202fd1def8b496e00ed256505c0de5..c0e2a587917474a37a515ff7c70e133ee193f0ba 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-db.dtsi
+++ b/arch/arm/boot/dts/kirkwood-db.dtsi
@@ -12,7 +12,7 @@
  * and 6282 variants of the Marvell Kirkwood Development Board.
  */
 
-/include/ "kirkwood.dtsi"
+#include "kirkwood.dtsi"
 
 / {
        memory {
@@ -77,13 +77,21 @@
                        cd-gpios = <&gpio1 6 0>;
                        status = "okay";
                };
+       };
+};
 
-               pcie-controller {
-                       status = "okay";
+&mdio {
+       status = "okay";
 
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
+       ethphy0: ethernet-phy@8 {
+               device_type = "ethernet-phy";
+               reg = <8>;
+       };
+};
+
+&eth0 {
+       status = "okay";
+       ethernet0-port@0 {
+               phy-handle = <&ethphy0>;
        };
 };