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

Commit f6192c66 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge commit '79499bb1' into fixes

parents 8a0098c0 79499bb1

arch/arm/boot/dts/am335x-baltos-ir2110.dts

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 
};



&cpsw_emac1 {

	phy-mode = "rgmii-txid";

	phy-mode = "rgmii-id";

	dual_emac_res_vlan = <2>;

	phy-handle = <&phy1>;

};

arch/arm/boot/dts/am335x-baltos-ir3220.dts

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ 
};



&cpsw_emac1 {

	phy-mode = "rgmii-txid";

	phy-mode = "rgmii-id";

	dual_emac_res_vlan = <2>;

	phy-handle = <&phy1>;

};

arch/arm/boot/dts/am335x-baltos-ir5221.dts

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ 
};



&cpsw_emac1 {

	phy-mode = "rgmii-txid";

	phy-mode = "rgmii-id";

	dual_emac_res_vlan = <2>;

	phy-handle = <&phy1>;

};