Merge branch 'am335x-phy-fixes' into omap-for-v5.0/fixes-v2

This commit is contained in:
Tony Lindgren 2019-02-19 08:47:17 -08:00
commit 0661465ec8
2 changed files with 3 additions and 3 deletions

View File

@ -729,7 +729,7 @@ ethphy0: ethernet-phy@0 {
&cpsw_emac0 {
phy-handle = <&ethphy0>;
phy-mode = "rgmii-txid";
phy-mode = "rgmii-id";
};
&tscadc {

View File

@ -651,13 +651,13 @@ ethphy1: ethernet-phy@1 {
&cpsw_emac0 {
phy-handle = <&ethphy0>;
phy-mode = "rgmii-txid";
phy-mode = "rgmii-id";
dual_emac_res_vlan = <1>;
};
&cpsw_emac1 {
phy-handle = <&ethphy1>;
phy-mode = "rgmii-txid";
phy-mode = "rgmii-id";
dual_emac_res_vlan = <2>;
};