Merge branch 'master' into fixes

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / am335x-wega.dtsi

diff --git a/arch/arm/boot/dts/am335x-wega.dtsi b/arch/arm/boot/dts/am335x-wega.dtsi
index 02c67365c4e1611cb6413b7a0cd0fa115a8a5e75..8ce541739b24f08bb4a4a0677caee390ba4f899e 100644 (file)
--- a/arch/arm/boot/dts/am335x-wega.dtsi
+++ b/arch/arm/boot/dts/am335x-wega.dtsi
@@ -119,11 +119,17 @@
 };
 
 &cpsw_emac1 {
-       phy_id = <&davinci_mdio>, <1>;
+       phy-handle = <&phy1>;
        phy-mode = "mii";
        dual_emac_res_vlan = <2>;
 };
 
+&davinci_mdio {
+       phy1: ethernet-phy@1 {
+               reg = <1>;
+       };
+};
+
 &mac {
        slaves = <2>;
        pinctrl-names = "default";
@@ -206,7 +212,6 @@
 };
 
 &usb0 {
-       dr_mode = "peripheral";
        status = "okay";
 };