MLK-23871 imx: Increase ENET PHY negotiation timeout for all iMX

Found the default negotiation timeout 4s is not enough in our test
environment. Increase it to 20s to avoid timeout.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Fugang Duan <fugang.duan@nxp.com>
(cherry picked from commit 60bb4d5a27b9444ad4e8ca1b948ac8c54e28d856)
(cherry picked from commit ebfaa34c8e590002c2a88572aff97e63a9fc67e9)
(cherry picked from commit 6caf6439c0fbcdf69d78ceb6e66b4d16aff17155)

13 files changed, 16 insertions, 1 deletions

diff --git a/include/configs/imx8dxl_evk.h b/include/configs/imx8dxl_evk.h
index 2c1c0614014..93c2f684732 100644
--- a/include/configs/imx8dxl_evk.h
+++ b/include/configs/imx8dxl_evk.h
@@ -283,5 +283,6 @@
 #define DWC_NET_PHYADDR			0
 
 #define CONFIG_ETHPRIME                 "eth1"
+#define PHY_ANEG_TIMEOUT 20000
 
 #endif /* __IMX8DXL_EVK_H */
diff --git a/include/configs/imx8dxl_phantom_mek.h b/include/configs/imx8dxl_phantom_mek.h
index bd71508473f..1231012ec32 100644
--- a/include/configs/imx8dxl_phantom_mek.h
+++ b/include/configs/imx8dxl_phantom_mek.h
@@ -249,6 +249,7 @@
 #define CONFIG_ETHPRIME                 "eth1"
 
 #define CONFIG_FEC_XCV_TYPE		RGMII
+#define PHY_ANEG_TIMEOUT 20000
 
 
 #endif /* __IMX8DXL_PHANTOM_MEK_H */
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index 408c586294a..ccda4cb896c 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -54,6 +54,7 @@
 /* ENET1 */
 #if defined(CONFIG_FEC_MXC)
 #define CONFIG_ETHPRIME                 "FEC"
+#define PHY_ANEG_TIMEOUT 20000
 
 #define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          0
diff --git a/include/configs/imx8mm_val.h b/include/configs/imx8mm_val.h
index b317deab790..f6373adf050 100644
--- a/include/configs/imx8mm_val.h
+++ b/include/configs/imx8mm_val.h
@@ -43,6 +43,7 @@
 /* ENET1 */
 #if defined(CONFIG_FEC_MXC)
 #define CONFIG_ETHPRIME                 "FEC"
+#define PHY_ANEG_TIMEOUT 20000
 
 
 #define IMX_FEC_BASE			0x30BE0000
diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
index 452752f4dc1..ce54e4b6b51 100644
--- a/include/configs/imx8mn_evk.h
+++ b/include/configs/imx8mn_evk.h
@@ -50,6 +50,7 @@
 /* ENET1 */
 #if defined(CONFIG_FEC_MXC)
 #define CONFIG_ETHPRIME                 "FEC"
+#define PHY_ANEG_TIMEOUT 20000
 
 #define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          0
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index c081fe5427e..d496f5dda65 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -40,6 +40,7 @@
 /* ENET1 */
 #if defined(CONFIG_FEC_MXC)
 #define CONFIG_ETHPRIME                 "FEC"
+#define PHY_ANEG_TIMEOUT 20000
 
 #define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          0
diff --git a/include/configs/imx8mq_val.h b/include/configs/imx8mq_val.h
index 728a8e94f33..025db9bef17 100644
--- a/include/configs/imx8mq_val.h
+++ b/include/configs/imx8mq_val.h
@@ -50,6 +50,7 @@
 /* ENET1 */
 #if defined(CONFIG_FEC_MXC)
 #define CONFIG_ETHPRIME                 "FEC"
+#define PHY_ANEG_TIMEOUT 20000
 
 #define FEC_QUIRK_ENET_MAC
 
diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index 7d591f6185e..0edc5dc3262 100644
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -49,6 +49,7 @@
 
 #define CONFIG_FEC_XCV_TYPE             RGMII
 #define FEC_QUIRK_ENET_MAC
+#define PHY_ANEG_TIMEOUT 20000
 
 /* ENET0 connects AR8031 on CPU board, ENET1 connects to base board */
 #define CONFIG_FEC_ENET_DEV 0
diff --git a/include/configs/imx8qm_val.h b/include/configs/imx8qm_val.h
index da3b9f925bd..da30754e046 100644
--- a/include/configs/imx8qm_val.h
+++ b/include/configs/imx8qm_val.h
@@ -51,6 +51,7 @@
 
 #define CONFIG_FEC_XCV_TYPE             RGMII
 #define FEC_QUIRK_ENET_MAC
+#define PHY_ANEG_TIMEOUT 20000
 
 /* ENET0 connects AR8031 on CPU board, ENET1 connects to base board */
 #define CONFIG_ETHPRIME                 "eth0"
diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index 2ea9f12d026..f90001ec692 100644
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -250,5 +250,6 @@
 #endif
 
 #define CONFIG_FEC_XCV_TYPE		RGMII
+#define PHY_ANEG_TIMEOUT 20000
 
 #endif /* __IMX8QXP_MEK_H */
diff --git a/include/configs/imx8qxp_val.h b/include/configs/imx8qxp_val.h
index c8d9c99bd62..a5dfb35a454 100644
--- a/include/configs/imx8qxp_val.h
+++ b/include/configs/imx8qxp_val.h
@@ -52,6 +52,7 @@
 #define CONFIG_PCI_SCAN_SHOW
 
 #define CONFIG_FEC_XCV_TYPE             RGMII
+#define PHY_ANEG_TIMEOUT 20000
 
 /* ENET0 connects AR8031 on CPU board, ENET1 connects to base board */
 #define CONFIG_ETHPRIME                 "eth0"
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 96445eb9bd5..cfa3d6c4f0c 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -34,6 +34,9 @@
 #define CONFIG_SYS_MAXARGS	32
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE
 
+/* NET PHY */
+#define PHY_ANEG_TIMEOUT 20000
+
 /* MMC */
 #define CONFIG_SUPPORT_EMMC_BOOT
 
diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index 89fdbe62d41..8fb2dcd201a 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -30,7 +30,8 @@
 
 /* UART */
 
-/* MMC */
+/* NET PHY */
+#define PHY_ANEG_TIMEOUT 20000
 
 #define CONFIG_ARMV7_SECURE_BASE	0x00900000