]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
arm64: dts: ti: k3-*: Replace rgmii-rxid with rgmii-id for CPSW ports
authorSiddharth Vadapalli <s-vadapalli@ti.com>
Sat, 25 Oct 2025 07:37:59 +0000 (13:07 +0530)
committerVignesh Raghavendra <vigneshr@ti.com>
Thu, 6 Nov 2025 05:29:21 +0000 (10:59 +0530)
The MAC Ports across all of the CPSW instances (CPSW2G, CPSW3G, CPSW5G and
CPSW9G) present in various K3 SoCs only support the 'RGMII-ID' mode. This
correction has been implemented/enforced by the updates to:
a) Device-Tree binding for CPSW [0]
b) Driver for CPSW [1]
c) Driver for CPSW MAC Port's GMII [2]

To complete the transition from 'RGMII-RXID' to 'RGMII-ID', update the
'phy-mode' property for all CPSW ports by replacing 'rgmii-rxid' with
'rgmii-id'.

[0]: commit 9b357ea52523 ("dt-bindings: net: ti: k3-am654-cpsw-nuss: update phy-mode in example")
[1]: commit ca13b249f291 ("net: ethernet: ti: am65-cpsw: fixup PHY mode for fixed RGMII TX delay")
[2]: commit a22d3b0d49d4 ("phy: ti: gmii-sel: Always write the RGMII ID setting")

Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>
Tested-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com> # k3-am642-tqma64xxl-mbax4xxl
Tested-by: Francesco Dolcini <francesco.dolcini@toradex.com> # Toradex Verdin AM62P
Link: https://patch.msgid.link/20251025073802.1790437-1-s-vadapalli@ti.com
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
33 files changed:
arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi
arch/arm64/boot/dts/ti/k3-am62-verdin-dev.dtsi
arch/arm64/boot/dts/ti/k3-am62-verdin-ivy.dtsi
arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi
arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
arch/arm64/boot/dts/ti/k3-am625-sk-common.dtsi
arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi
arch/arm64/boot/dts/ti/k3-am62a7-sk.dts
arch/arm64/boot/dts/ti/k3-am62p-verdin-dev.dtsi
arch/arm64/boot/dts/ti/k3-am62p-verdin-ivy.dtsi
arch/arm64/boot/dts/ti/k3-am62p-verdin.dtsi
arch/arm64/boot/dts/ti/k3-am62p5-sk.dts
arch/arm64/boot/dts/ti/k3-am62x-phyboard-lyra.dtsi
arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi
arch/arm64/boot/dts/ti/k3-am642-evm.dts
arch/arm64/boot/dts/ti/k3-am642-sk.dts
arch/arm64/boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts
arch/arm64/boot/dts/ti/k3-am654-base-board.dts
arch/arm64/boot/dts/ti/k3-am67a-beagley-ai.dts
arch/arm64/boot/dts/ti/k3-am68-phyboard-izar.dts
arch/arm64/boot/dts/ti/k3-am68-phycore-som.dtsi
arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts
arch/arm64/boot/dts/ti/k3-am69-sk.dts
arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts
arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
arch/arm64/boot/dts/ti/k3-j721e-evm-gesi-exp-board.dtso
arch/arm64/boot/dts/ti/k3-j721e-sk.dts
arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
arch/arm64/boot/dts/ti/k3-j721s2-evm-gesi-exp-board.dtso
arch/arm64/boot/dts/ti/k3-j722s-evm.dts
arch/arm64/boot/dts/ti/k3-j784s4-j742s2-evm-common.dtsi

index eeca643fedbe997034cfffd7d365e796876a544a..985963774c002286aed02555ebe9fb3209f5e082 100644 (file)
 };
 
 &cpsw_port1 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&cpsw3g_phy1>;
        bootph-all;
 };
index 5c1284b802ad7fcc91ac30eac486f1210587fbd2..3d1406acf680a705d738f202e6789fdcfb852336 100644 (file)
@@ -74,7 +74,7 @@
 /* Verdin ETH_2_RGMII */
 &cpsw_port2 {
        phy-handle = <&cpsw3g_phy1>;
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        status = "okay";
 };
 
index 71c29eab0eee77cccc0837d559ce86d813cd0a1c..844f59f772e18d3675ae8b68c602537c59e4fb41 100644 (file)
 /* Verdin ETH_2_RGMII */
 &cpsw_port2 {
        phy-handle = <&cpsw3g_phy1>;
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        status = "okay";
 };
 
index dc4b228a9fd7ee60c44017ebfa4ce7d9f1927c72..2a7242a2fef878b25c83874e930e4c8e0da0be5f 100644 (file)
 /* Verdin ETH_1 (On-module PHY) */
 &cpsw_port1 {
        phy-handle = <&cpsw3g_phy0>;
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        status = "disabled";
 };
 
index 7028d9835c4a89cc3f5ca17543b18d3419751f0a..7b9ae467e95aeac4970405da50f5ce102e6e6755 100644 (file)
 };
 
 &cpsw_port1 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&cpsw3g_phy0>;
 };
 
index fe0b98e1d10557a7b649b04105545f913d2d9056..7eb9066bff82c8ed018b5f335590a56009a9b1fd 100644 (file)
 };
 
 &cpsw_port2 {
-       /* PCB provides an internal delay of 2ns */
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&cpsw3g_phy1>;
 };
 
index b3d012a5a26aa72677b076db3c1b861dce138256..b24a63feeab83dcd916c13f2b51969165bf0906c 100644 (file)
 };
 
 &cpsw_port1 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&cpsw3g_phy1>;
        bootph-all;
 };
index af591fe6ae4f0a91991d2904a9a61905a0eeb614..de850307912c43e8bcec43ddc3ec3a4a7db740fb 100644 (file)
 
 &cpsw_port1 {
        status = "okay";
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&cpsw3g_phy0>;
        bootph-all;
 };
index 0679d76f31bda56acf034626335f27e04de752ad..a0d5b15fc1478fe45f5a5c7ab46ffb1f5b38c7ea 100644 (file)
@@ -78,7 +78,7 @@
 /* Verdin ETH_2_RGMII */
 &cpsw_port2 {
        phy-handle = <&carrier_eth_phy>;
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        status = "okay";
 };
 
index 317c8818f9ee96d668f1e48bd008f8f098aa95bf..04f13edcb166b7e04409abdaaf0a11ea14639cd8 100644 (file)
 /* Verdin ETH_2_RGMII */
 &cpsw_port2 {
        phy-handle = <&carrier_eth_phy>;
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        status = "okay";
 };
 
index 99810047614e3cf00892c12ecd2864f7b32c9a7c..5e050cbb9eaf3bacefc18699306b4e63650e2a74 100644 (file)
 /* Verdin ETH_1 (On-module PHY) */
 &cpsw_port1 {
        phy-handle = <&som_eth_phy>;
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        status = "disabled";
 };
 
index a064a632680ec69dba9dbe591fd49caeb9ac1111..f04cf2d23d84531a9e045021c669615de6e09331 100644 (file)
 };
 
 &cpsw_port1 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&cpsw3g_phy0>;
        status = "okay";
        bootph-all;
 };
 
 &cpsw_port2 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&cpsw3g_phy1>;
        status = "okay";
 };
index aab74d6019b0a309475bfc7e7798fbc33f8d8b0b..d6e70ee15938e8e713e96ced24dff0be2bae3a6c 100644 (file)
 };
 
 &cpsw_port2 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&cpsw3g_phy3>;
 };
 
index 58f78c0de292de5841fae6a4ca0de6d892c4adcd..50ed859ae06c47af38b11753d909a91485d438e5 100644 (file)
 
 &cpsw_port1 {
        bootph-all;
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&cpsw3g_phy0>;
 };
 
index 02ef1dd92eaa85085a7928190afaa9d47b03ef45..d64fb81b04e24a42acec82925bd4f48fbfad9a6c 100644 (file)
 };
 
 &cpsw_port1 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&cpsw3g_phy1>;
        bootph-all;
        status = "okay";
index 52bdf7102192c271335eaceff14b42a7740bce85..88093ab74502c77064289ccee716741b5a6e4228 100644 (file)
 
 &cpsw_port1 {
        bootph-all;
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&cpsw3g_phy0>;
        status = "okay";
 };
 
 &cpsw_port2 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&cpsw3g_phy3>;
        status = "okay";
 };
index 1fb1b91a1badbfe4c3d684c701806ade90eb66e9..34bfa99bd4b880d42c05ad3e47fe972b6c3166fd 100644 (file)
 };
 
 &cpsw_port1 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&cpsw3g_phy0>;
        status = "okay";
 };
 
 &cpsw_port2 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&cpsw3g_phy1>;
        status = "okay";
 };
index 7a69e729eae842d45ed16a41df41803dd30ef98c..46be6824dd1637a6c4462ea2d08b8d2b0e362ab8 100644 (file)
 };
 
 &cpsw_port1 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&cpsw3g_phy0>;
        status = "okay";
 };
index 0c42c486d83a44e2c94cdc146c818084c18ccba3..961287b6a3ed3e19f313d2163fec4d5d8a63b744 100644 (file)
 };
 
 &cpsw_port1 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&phy0>;
 };
 
index b697035df04e506985465b8333936fa9d28cde03..5255e04b9ac76d71fdac9ab32a6db37eba710393 100644 (file)
 };
 
 &cpsw_port1 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&cpsw3g_phy0>;
        status = "okay";
 };
index 41c8f8526e15dbb4188848139b6253481b2ce09a..edc9f9b12f0e2204a54c6a2bec9fec94319b58a3 100644 (file)
 };
 
 &cpsw_port1 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&phy0>;
 };
 
index 10a7eddcae4d6bb2fcedd68833555e5f5162014d..0ff511028f81f6d693d380f17d7d8d368cd2ba55 100644 (file)
 
 &main_cpsw_port1 {
        phy-handle = <&phy1>;
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        status = "okay";
 };
 
index 75a107456ce1df22e94d6d8db759cd2696a71b84..b8400cba832b6a79912fe4d9fc350cef8a3b52c9 100644 (file)
 };
 
 &cpsw_port1 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&phy0>;
        bootph-all;
 };
index 0e2d12cb051da8c42f1f3b0ee6a7ed31000183ff..abe2f21e0e1db5babae87ba6ac68a3f7a5eb484f 100644 (file)
 
 &mcu_cpsw_port1 {
        status = "okay";
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&mcu_phy0>;
        bootph-all;
 };
index f684ce6ad9ad2f930612eecb7e6677b62db99d5a..4608828512d133f05b8287a9d20dc3e1de5589fe 100644 (file)
 };
 
 &cpsw_port1 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&phy0>;
 };
 
index 352fb60e6ce83f64bd0a21a23bb11dbff160744c..2e9455ab0bfa1fddcb297ef938c5912995aee5d5 100644 (file)
 };
 
 &cpsw_port1 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&phy0>;
 };
 
index 45311438315f23f771b11b4f2b0b86eb054c0d59..317cd0bfa40618b51d9a43f80f734b2161b015b8 100644 (file)
 };
 
 &cpsw_port1 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&phy0>;
 };
 
index f84aa9f9454792ff77ee4515c27e435c5cfb7a18..3bfe6036a8e6f344040facfde553560653064507 100644 (file)
@@ -37,7 +37,7 @@
 &cpsw0_port1 {
        status = "okay";
        phy-handle = <&cpsw9g_phy12>;
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        mac-address = [00 00 00 00 00 00];
        phys = <&cpsw0_phy_gmii_sel 1>;
 };
@@ -45,7 +45,7 @@
 &cpsw0_port2 {
        status = "okay";
        phy-handle = <&cpsw9g_phy15>;
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        mac-address = [00 00 00 00 00 00];
        phys = <&cpsw0_phy_gmii_sel 2>;
 };
@@ -53,7 +53,7 @@
 &cpsw0_port3 {
        status = "okay";
        phy-handle = <&cpsw9g_phy0>;
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        mac-address = [00 00 00 00 00 00];
        phys = <&cpsw0_phy_gmii_sel 3>;
 };
@@ -61,7 +61,7 @@
 &cpsw0_port4 {
        status = "okay";
        phy-handle = <&cpsw9g_phy3>;
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        mac-address = [00 00 00 00 00 00];
        phys = <&cpsw0_phy_gmii_sel 4>;
 };
index 5e5784ef6f8585557e5993bb5eb6cdac0b4d946b..febbac9262de2f6090842b7287dde080635a787e 100644 (file)
 };
 
 &cpsw_port1 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&phy0>;
 };
 
index 9e43dcff8ef22a11dda8d24e0784c61e3ff700e3..24f57f02588fa2cccecf63417932d56811a6c29e 100644 (file)
 };
 
 &cpsw_port1 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&phy0>;
 };
 
index 8583178fa1f3ed81fcc45f93567de8148c2984d1..6869a95c62146e2148d5fa996502b1140eec0485 100644 (file)
@@ -80,6 +80,6 @@
 
 &main_cpsw_port1 {
        status = "okay";
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&main_cpsw_phy0>;
 };
index 55deda500f0321a5768a410bfbfce3d38e6409b5..7baf5764862b1bad8a956a2483ef83e03176d9a6 100644 (file)
 };
 
 &cpsw_port1 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&cpsw3g_phy0>;
        status = "okay";
        bootph-all;
index b9d1d3769a54da82bfa00340aa12d2d12814d9ab..e5073557773711b28a6049d0c27958c1147c1f39 100644 (file)
 
 &mcu_cpsw_port1 {
        status = "okay";
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&mcu_phy0>;
 };
 
 };
 
 &main_cpsw1_port1 {
-       phy-mode = "rgmii-rxid";
+       phy-mode = "rgmii-id";
        phy-handle = <&main_cpsw1_phy0>;
        status = "okay";
 };