Skip to content

Commit 99706d6

Browse files
committed
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 bcf3440 ("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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 364d1ac + fb6823a commit 99706d6

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@
943943

944944
&cpsw_emac0 {
945945
phy-handle = <&ethphy0>;
946-
phy-mode = "rgmii";
946+
phy-mode = "rgmii-rxid";
947947
};
948948

949949
&elm {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@
504504

505505
&cpsw_emac0 {
506506
phy-handle = <&ethphy0>;
507-
phy-mode = "rgmii";
507+
phy-mode = "rgmii-rxid";
508508
};
509509

510510
&rtc {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -833,13 +833,13 @@
833833

834834
&cpsw_emac0 {
835835
phy-handle = <&ethphy0>;
836-
phy-mode = "rgmii";
836+
phy-mode = "rgmii-rxid";
837837
dual_emac_res_vlan = <1>;
838838
};
839839

840840
&cpsw_emac1 {
841841
phy-handle = <&ethphy1>;
842-
phy-mode = "rgmii";
842+
phy-mode = "rgmii-rxid";
843843
dual_emac_res_vlan = <2>;
844844
};
845845

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,13 @@
190190

191191
&cpsw_port1 {
192192
phy-handle = <&ethphy0_sw>;
193-
phy-mode = "rgmii";
193+
phy-mode = "rgmii-rxid";
194194
ti,dual-emac-pvid = <1>;
195195
};
196196

197197
&cpsw_port2 {
198198
phy-handle = <&ethphy1_sw>;
199-
phy-mode = "rgmii";
199+
phy-mode = "rgmii-rxid";
200200
ti,dual-emac-pvid = <2>;
201201
};
202202

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,13 +433,13 @@
433433

434434
&cpsw_emac0 {
435435
phy-handle = <&phy0>;
436-
phy-mode = "rgmii";
436+
phy-mode = "rgmii-rxid";
437437
dual_emac_res_vlan = <1>;
438438
};
439439

440440
&cpsw_emac1 {
441441
phy-handle = <&phy1>;
442-
phy-mode = "rgmii";
442+
phy-mode = "rgmii-rxid";
443443
dual_emac_res_vlan = <2>;
444444
};
445445

arch/arm/boot/dts/am57xx-idk-common.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,13 +408,13 @@
408408

409409
&cpsw_emac0 {
410410
phy-handle = <&ethphy0>;
411-
phy-mode = "rgmii";
411+
phy-mode = "rgmii-rxid";
412412
dual_emac_res_vlan = <1>;
413413
};
414414

415415
&cpsw_emac1 {
416416
phy-handle = <&ethphy1>;
417-
phy-mode = "rgmii";
417+
phy-mode = "rgmii-rxid";
418418
dual_emac_res_vlan = <2>;
419419
};
420420

arch/arm/boot/dts/dm814x.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@
693693

694694
davinci_mdio: mdio@800 {
695695
compatible = "ti,cpsw-mdio", "ti,davinci_mdio";
696-
clocks = <&alwon_ethernet_clkctrl DM814_ETHERNET_CPGMAC0_CLKCTRL 0>;
696+
clocks = <&cpsw_125mhz_gclk>;
697697
clock-names = "fck";
698698
#address-cells = <1>;
699699
#size-cells = <0>;

0 commit comments

Comments
 (0)