Merge remote-tracking branch 'mvebu/for-next'

[karo-tx-linux.git] / arch / arm / boot / dts / kirkwood-lsxl.dtsi

diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
index 31b17f5b9d285cc3fdb956157fe2a79b0cdccb63..bc34a609a1952c46adc3e1f3c6ca39f53b48a6fa 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@@ -1,5 +1,5 @@
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
 
 / {
        chosen {
@@ -150,7 +150,7 @@
                led@4 {
                        label = "lsxl:blue:power";
                        gpios = <&gpio1 7 1>;
-                       linux,default-trigger = "default-on";
+                       default-state = "keep";
                };
 
                led@5 {
@@ -207,3 +207,31 @@
                };
        };
 };
+
+&mdio {
+       status = "okay";
+
+       ethphy0: ethernet-phy@0 {
+               device_type = "ethernet-phy";
+               reg = <0>;
+       };
+
+       ethphy1: ethernet-phy@8 {
+               device_type = "ethernet-phy";
+               reg = <8>;
+       };
+};
+
+&eth0 {
+       status = "okay";
+       ethernet0-port@0 {
+               phy-handle = <&ethphy0>;
+       };
+};
+
+&eth1 {
+       status = "okay";
+       ethernet1-port@0 {
+               phy-handle = <&ethphy1>;
+       };
+};