Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0661465e authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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

parents 50d6b3cf 37685f6a

arch/arm/boot/dts/am335x-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ 


&cpsw_emac0 {

	phy-handle = <&ethphy0>;

	phy-mode = "rgmii-txid";

	phy-mode = "rgmii-id";

};



&tscadc {

arch/arm/boot/dts/am335x-evmsk.dts

+2 −2
Original line number Diff line number Diff line
@@ -651,13 +651,13 @@ 


&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>;

};