Merge commit '79499bb11db508' into fixes

This commit is contained in:
Tony Lindgren
2019-06-12 01:54:11 -07:00
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -68,7 +68,7 @@
};
&cpsw_emac1 {
phy-mode = "rgmii-txid";
phy-mode = "rgmii-id";
dual_emac_res_vlan = <2>;
phy-handle = <&phy1>;
};
+1 -1
View File
@@ -110,7 +110,7 @@
};
&cpsw_emac1 {
phy-mode = "rgmii-txid";
phy-mode = "rgmii-id";
dual_emac_res_vlan = <2>;
phy-handle = <&phy1>;
};
+1 -1
View File
@@ -128,7 +128,7 @@
};
&cpsw_emac1 {
phy-mode = "rgmii-txid";
phy-mode = "rgmii-id";
dual_emac_res_vlan = <2>;
phy-handle = <&phy1>;
};