Merge tag 'omap-for-v5.7/cpsw-fixes-signed' of... (99706d62) · Commits · 戴 / test

Merge tag 'omap-for-v5.7/cpsw-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes Few cpsw related dts fixes for omaps Recent cpsw driver changes exposed few regressions in the cpsw related dts configuration that would be good to fix: - Few more boards still need to be updated to use rgmii-rxid phy caused by the fallout from commit ("net: phy: micrel: add phy-mode support for the KSZ9031 PHY" as the rx delay is now disabled unless we use rgmii-rxid. - On dm814x we have been using a wrong clock for mdio that now can produce external abort on some boards * tag 'omap-for-v5.7/cpsw-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: Fix wrong mdio clock for dm814x ARM: dts: am437x: fix networking on boards with ksz9031 phy ARM: dts: am57xx: fix networking on boards with ksz9031 phy Link: https://lore.kernel.org/r/pull-1589472123-367692@atomide.com Signed-off-by:

Arnd Bergmann <arnd@arndb.de>

arch/arm/boot/dts/am437x-gp-evm.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -943,7 +943,7 @@

		&cpsw_emac0 {
		phy-handle = <&ethphy0>;
		phy-mode = "rgmii";
		phy-mode = "rgmii-rxid";
		};

		&elm {

arch/arm/boot/dts/am437x-idk-evm.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -504,7 +504,7 @@

		&cpsw_emac0 {
		phy-handle = <&ethphy0>;
		phy-mode = "rgmii";
		phy-mode = "rgmii-rxid";
		};

		&rtc {

arch/arm/boot/dts/am437x-sk-evm.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -833,13 +833,13 @@

		&cpsw_emac0 {
		phy-handle = <&ethphy0>;
		phy-mode = "rgmii";
		phy-mode = "rgmii-rxid";
		dual_emac_res_vlan = <1>;
		};

		&cpsw_emac1 {
		phy-handle = <&ethphy1>;
		phy-mode = "rgmii";
		phy-mode = "rgmii-rxid";
		dual_emac_res_vlan = <2>;
		};

arch/arm/boot/dts/am571x-idk.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -190,13 +190,13 @@

		&cpsw_port1 {
		phy-handle = <&ethphy0_sw>;
		phy-mode = "rgmii";
		phy-mode = "rgmii-rxid";
		ti,dual-emac-pvid = <1>;
		};

		&cpsw_port2 {
		phy-handle = <&ethphy1_sw>;
		phy-mode = "rgmii";
		phy-mode = "rgmii-rxid";
		ti,dual-emac-pvid = <2>;
		};

arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -433,13 +433,13 @@

		&cpsw_emac0 {
		phy-handle = <&phy0>;
		phy-mode = "rgmii";
		phy-mode = "rgmii-rxid";
		dual_emac_res_vlan = <1>;
		};

		&cpsw_emac1 {
		phy-handle = <&phy1>;
		phy-mode = "rgmii";
		phy-mode = "rgmii-rxid";
		dual_emac_res_vlan = <2>;
		};

Admin message