Commit f6192c66 authored by Tony Lindgren's avatar Tony Lindgren

Merge commit '79499bb1' into fixes

parents 8a0098c0 79499bb1
...@@ -68,7 +68,7 @@ &cpsw_emac0 { ...@@ -68,7 +68,7 @@ &cpsw_emac0 {
}; };
&cpsw_emac1 { &cpsw_emac1 {
phy-mode = "rgmii-txid"; phy-mode = "rgmii-id";
dual_emac_res_vlan = <2>; dual_emac_res_vlan = <2>;
phy-handle = <&phy1>; phy-handle = <&phy1>;
}; };
...@@ -110,7 +110,7 @@ fixed-link { ...@@ -110,7 +110,7 @@ fixed-link {
}; };
&cpsw_emac1 { &cpsw_emac1 {
phy-mode = "rgmii-txid"; phy-mode = "rgmii-id";
dual_emac_res_vlan = <2>; dual_emac_res_vlan = <2>;
phy-handle = <&phy1>; phy-handle = <&phy1>;
}; };
...@@ -128,7 +128,7 @@ fixed-link { ...@@ -128,7 +128,7 @@ fixed-link {
}; };
&cpsw_emac1 { &cpsw_emac1 {
phy-mode = "rgmii-txid"; phy-mode = "rgmii-id";
dual_emac_res_vlan = <2>; dual_emac_res_vlan = <2>;
phy-handle = <&phy1>; phy-handle = <&phy1>;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment