diff options
| author | Tom Rini <trini@konsulko.com> | 2024-09-25 08:21:40 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-09-25 08:21:40 -0600 |
| commit | 49e3b574ed4f6dc26b65a5d6e9cd14b97e03b861 (patch) | |
| tree | 4329c0e6420afcf622fdfaef91c1598a556a67f9 | |
| parent | 2add54d496ee8e0e99cf5c6e892c22cfc2e115a3 (diff) | |
| parent | 99abeaa648052e8e99682f046b8dfd3739b4e181 (diff) | |
Merge tag 'u-boot-imx-next-20240925' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx into next
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/22406
- i.MX93 FEC fixes.
- Always name the generated fitImage u-boot.itb to keep compatibility
with pr-buildman behavior.
-----------------------
| -rw-r--r-- | arch/arm/dts/imx8mm-u-boot.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/dts/imx8mn-u-boot.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/dts/imx8mp-u-boot.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/dts/imx8mq-u-boot.dtsi | 1 | ||||
| -rw-r--r-- | drivers/net/fec_mxc.c | 10 |
5 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi index c02e11def5f..d31bc822532 100644 --- a/arch/arm/dts/imx8mm-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-u-boot.dtsi @@ -122,6 +122,7 @@ binman_imx_fit: fit { description = "Configuration to load ATF before U-Boot"; + filename = "u-boot.itb"; #ifndef CONFIG_IMX_HAB fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>; #endif diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi index 732191f5205..6875c6d44ff 100644 --- a/arch/arm/dts/imx8mn-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-u-boot.dtsi @@ -193,6 +193,7 @@ binman_imx_fit: fit { description = "Configuration to load ATF before U-Boot"; + filename = "u-boot.itb"; #ifndef CONFIG_IMX_HAB fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>; #endif diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi index f2655a4d0c8..56749ccacd2 100644 --- a/arch/arm/dts/imx8mp-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-u-boot.dtsi @@ -148,6 +148,7 @@ binman_imx_fit: fit { description = "Configuration to load ATF before U-Boot"; + filename = "u-boot.itb"; #ifndef CONFIG_IMX_HAB fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>; #endif diff --git a/arch/arm/dts/imx8mq-u-boot.dtsi b/arch/arm/dts/imx8mq-u-boot.dtsi index 9b895a63857..d7a83a78f4d 100644 --- a/arch/arm/dts/imx8mq-u-boot.dtsi +++ b/arch/arm/dts/imx8mq-u-boot.dtsi @@ -106,6 +106,7 @@ binman_imx_fit: fit { description = "Configuration to load ATF before U-Boot"; + filename = "u-boot.itb"; #ifndef CONFIG_IMX_HAB fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>; #endif diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 2dc1364beec..d6d5cb52fdd 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -817,6 +817,9 @@ static int fecmxc_recv(struct udevice *dev, int flags, uchar **packetp) return -ENOMEM; } + if (!(readl(&fec->eth->ecntrl) & FEC_ECNTRL_ETHER_EN)) + return 0; + /* Check if any critical events have happened */ ievent = readl(&fec->eth->ievent); writel(ievent, &fec->eth->ievent); @@ -1209,10 +1212,13 @@ static int fecmxc_set_ref_clk(struct clk *clk_ref, phy_interface_t interface) else if (interface == PHY_INTERFACE_MODE_RGMII || interface == PHY_INTERFACE_MODE_RGMII_ID || interface == PHY_INTERFACE_MODE_RGMII_RXID || - interface == PHY_INTERFACE_MODE_RGMII_TXID) + interface == PHY_INTERFACE_MODE_RGMII_TXID) { freq = 125000000; - else + if (is_imx93()) + freq = freq << 1; + } else { return -EINVAL; + } ret = clk_set_rate(clk_ref, freq); if (ret < 0) |