Merge tag 'iwlwifi-for-kalle-2015-12-16' into next

[deliverable/linux.git] / arch / arm / boot / dts / stih418-b2199.dts

diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts
index 82eee39ccb310b79d1079a59c4adc9f77b16622f..772d2bb07e5f91c8a27156744601a6eb682679d7 100644 (file)
--- a/arch/arm/boot/dts/stih418-b2199.dts
+++ b/arch/arm/boot/dts/stih418-b2199.dts
@@ -24,6 +24,7 @@
 
        aliases {
                ttyAS0 = &sbc_serial0;
+               ethernet0 = &ethernet0;
        };
 
        soc {
@@ -101,5 +102,12 @@
                st_dwc3: dwc3@8f94000 {
                        status = "okay";
                };
+
+               ethernet0: dwmac@9630000 {
+                       st,tx-retime-src = "clkgen";
+                       status = "okay";
+                       phy-mode = "rgmii";
+                       fixed-link = <0 1 1000 0 0>;
+               };
        };
 };