* [PATCH] net: fec: Get rid of FEC_ENET_ENABLE_[TR]XC_DELAY
@ 2021-01-23 19:57 Marek Vasut
2021-01-23 22:04 ` Stefano Babic
0 siblings, 1 reply; 9+ messages in thread
From: Marek Vasut @ 2021-01-23 19:57 UTC (permalink / raw)
To: u-boot
On 1/23/21 8:54 PM, sbabic at denx.de wrote:
>> The FEC_ENET_ENABLE_.XC_DELAY setting is only used by one system which
>> supports OF control, correctly set the rgmii-id PHY mode in the DT and
>> then determine whether or not to enable the FEC RXC/TXC internal delay
>> based on the PHY mode.
[...]
> Applied to u-boot-imx, master, thanks !
Didn't this fail to build on mx25 ?
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] net: fec: Get rid of FEC_ENET_ENABLE_[TR]XC_DELAY
2021-01-23 19:57 [PATCH] net: fec: Get rid of FEC_ENET_ENABLE_[TR]XC_DELAY Marek Vasut
@ 2021-01-23 22:04 ` Stefano Babic
2021-01-24 14:35 ` Oleksandr Suvorov
0 siblings, 1 reply; 9+ messages in thread
From: Stefano Babic @ 2021-01-23 22:04 UTC (permalink / raw)
To: u-boot
Hi Marek,
On 23.01.21 20:57, Marek Vasut wrote:
> On 1/23/21 8:54 PM, sbabic at denx.de wrote:
>>> The FEC_ENET_ENABLE_.XC_DELAY setting is only used by one system which
>>> supports OF control, correctly set the rgmii-id PHY mode in the DT and
>>> then determine whether or not to enable the FEC RXC/TXC internal delay
>>> based on the PHY mode.
>
> [...]
>
>> Applied to u-boot-imx, master, thanks !
>
> Didn't this fail to build on mx25 ?
Yes, sorry, this is a false positive - patch has not been applied.
Regards,
Stefano
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] net: fec: Get rid of FEC_ENET_ENABLE_[TR]XC_DELAY
2021-01-23 22:04 ` Stefano Babic
@ 2021-01-24 14:35 ` Oleksandr Suvorov
2021-01-24 14:52 ` Marek Vasut
0 siblings, 1 reply; 9+ messages in thread
From: Oleksandr Suvorov @ 2021-01-24 14:35 UTC (permalink / raw)
To: u-boot
On Sun, Jan 24, 2021 at 12:04 AM Stefano Babic <sbabic@denx.de> wrote:
>
> Hi Marek,
>
> On 23.01.21 20:57, Marek Vasut wrote:
> > On 1/23/21 8:54 PM, sbabic at denx.de wrote:
> >>> The FEC_ENET_ENABLE_.XC_DELAY setting is only used by one system which
> >>> supports OF control, correctly set the rgmii-id PHY mode in the DT and
> >>> then determine whether or not to enable the FEC RXC/TXC internal delay
> >>> based on the PHY mode.
> >
> > [...]
> >
> >> Applied to u-boot-imx, master, thanks !
> >
> > Didn't this fail to build on mx25 ?
>
> Yes, sorry, this is a false positive - patch has not been applied.
Anyway, as there will be another solution that won't break mx25/mx35,
I should retest the new patch version on apalis, so I'm calling off my
review so far.
> Regards,
> Stefano
--
Best regards
Oleksandr Suvorov
cryosay at gmail.com
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] net: fec: Get rid of FEC_ENET_ENABLE_[TR]XC_DELAY
2021-01-24 14:35 ` Oleksandr Suvorov
@ 2021-01-24 14:52 ` Marek Vasut
2021-01-24 17:14 ` Oleksandr Suvorov
0 siblings, 1 reply; 9+ messages in thread
From: Marek Vasut @ 2021-01-24 14:52 UTC (permalink / raw)
To: u-boot
On 1/24/21 3:35 PM, Oleksandr Suvorov wrote:
> On Sun, Jan 24, 2021 at 12:04 AM Stefano Babic <sbabic@denx.de> wrote:
>>
>> Hi Marek,
>>
>> On 23.01.21 20:57, Marek Vasut wrote:
>>> On 1/23/21 8:54 PM, sbabic at denx.de wrote:
>>>>> The FEC_ENET_ENABLE_.XC_DELAY setting is only used by one system which
>>>>> supports OF control, correctly set the rgmii-id PHY mode in the DT and
>>>>> then determine whether or not to enable the FEC RXC/TXC internal delay
>>>>> based on the PHY mode.
>>>
>>> [...]
>>>
>>>> Applied to u-boot-imx, master, thanks !
>>>
>>> Didn't this fail to build on mx25 ?
>>
>> Yes, sorry, this is a false positive - patch has not been applied.
>
> Anyway, as there will be another solution that won't break mx25/mx35,
> I should retest the new patch version on apalis, so I'm calling off my
> review so far.
The only change required to that patch is an extra ifdef DM_ETH, so for
mx8 apalis nothing changed, since you have DM_ETH enabled.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] net: fec: Get rid of FEC_ENET_ENABLE_[TR]XC_DELAY
2021-01-24 14:52 ` Marek Vasut
@ 2021-01-24 17:14 ` Oleksandr Suvorov
0 siblings, 0 replies; 9+ messages in thread
From: Oleksandr Suvorov @ 2021-01-24 17:14 UTC (permalink / raw)
To: u-boot
Hi Marek,
On Sun, Jan 24, 2021 at 4:52 PM Marek Vasut <marex@denx.de> wrote:
>
> On 1/24/21 3:35 PM, Oleksandr Suvorov wrote:
> > On Sun, Jan 24, 2021 at 12:04 AM Stefano Babic <sbabic@denx.de> wrote:
> >>
> >> Hi Marek,
> >>
> >> On 23.01.21 20:57, Marek Vasut wrote:
> >>> On 1/23/21 8:54 PM, sbabic at denx.de wrote:
> >>>>> The FEC_ENET_ENABLE_.XC_DELAY setting is only used by one system which
> >>>>> supports OF control, correctly set the rgmii-id PHY mode in the DT and
> >>>>> then determine whether or not to enable the FEC RXC/TXC internal delay
> >>>>> based on the PHY mode.
> >>>
> >>> [...]
> >>>
> >>>> Applied to u-boot-imx, master, thanks !
> >>>
> >>> Didn't this fail to build on mx25 ?
> >>
> >> Yes, sorry, this is a false positive - patch has not been applied.
> >
> > Anyway, as there will be another solution that won't break mx25/mx35,
> > I should retest the new patch version on apalis, so I'm calling off my
> > review so far.
>
> The only change required to that patch is an extra ifdef DM_ETH, so for
> mx8 apalis nothing changed, since you have DM_ETH enabled.
Thanks for clarifying! So you have my review for apalis mx8.
--
Best regards
Oleksandr Suvorov
cryosay at gmail.com
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] net: fec: Get rid of FEC_ENET_ENABLE_[TR]XC_DELAY
2021-01-18 23:57 Marek Vasut
2021-01-20 8:17 ` Oleksandr Suvorov
@ 2021-01-23 15:49 ` sbabic at denx.de
1 sibling, 0 replies; 9+ messages in thread
From: sbabic at denx.de @ 2021-01-23 15:49 UTC (permalink / raw)
To: u-boot
> The FEC_ENET_ENABLE_.XC_DELAY setting is only used by one system which
> supports OF control, correctly set the rgmii-id PHY mode in the DT and
> then determine whether or not to enable the FEC RXC/TXC internal delay
> based on the PHY mode.
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Ramon Fried <rfried.dev@gmail.com>
> Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] net: fec: Get rid of FEC_ENET_ENABLE_[TR]XC_DELAY
2021-01-20 8:17 ` Oleksandr Suvorov
@ 2021-01-23 12:46 ` Stefano Babic
0 siblings, 0 replies; 9+ messages in thread
From: Stefano Babic @ 2021-01-23 12:46 UTC (permalink / raw)
To: u-boot
Hi Marek,
this rather breaks old platforms - I check with mx25pdk, but also mx35
is broken. Could you take a look ? Thanks !
+drivers/net/fec_mxc.c:510:9: error: 'struct fec_priv' has no member
named 'interface'
+ 510 | if (fec->interface == PHY_INTERFACE_MODE_RGMII_ID ||
+ | ^~
+drivers/net/fec_mxc.c:511:9: error: 'struct fec_priv' has no member
named 'interface'
+ 511 | fec->interface == PHY_INTERFACE_MODE_RGMII_TXID)
+drivers/net/fec_mxc.c:514:9: error: 'struct fec_priv' has no member
named 'interface'
+ 514 | if (fec->interface == PHY_INTERFACE_MODE_RGMII_ID ||
+drivers/net/fec_mxc.c:515:9: error: 'struct fec_priv' has no member
named 'interface'
+ 515 | fec->interface == PHY_INTERFACE_MODE_RGMII_RXID)
+make[2]: *** [scripts/Makefile.build:266: drivers/net/fec_mxc.o] Error 1
+make[1]: *** [Makefile:1787: drivers/net] Error 2
+make: *** [Makefile:167: sub-make] Error 2
arm: + mx25pdk
Regards,
Stefano
On 20.01.21 09:17, Oleksandr Suvorov wrote:
> Hi Marek,
>
> On Tue, Jan 19, 2021 at 1:57 AM Marek Vasut <marex@denx.de> wrote:
>>
>> The FEC_ENET_ENABLE_.XC_DELAY setting is only used by one system which
>> supports OF control, correctly set the rgmii-id PHY mode in the DT and
>> then determine whether or not to enable the FEC RXC/TXC internal delay
>> based on the PHY mode.
>>
>> Signed-off-by: Marek Vasut <marex@denx.de>
>
> Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
>
> Thanks & Regards
>
>> Cc: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
>> Cc: Stefano Babic <sbabic@denx.de>
>> Cc: Ramon Fried <rfried.dev@gmail.com>
>> ---
>> arch/arm/dts/fsl-imx8qm-apalis.dts | 2 +-
>> arch/arm/dts/fsl-imx8qxp-apalis.dts | 2 +-
>> drivers/net/fec_mxc.c | 14 ++++++--------
>> include/configs/apalis-imx8.h | 3 ---
>> include/configs/apalis-imx8x.h | 3 ---
>> 5 files changed, 8 insertions(+), 16 deletions(-)
>>
>> diff --git a/arch/arm/dts/fsl-imx8qm-apalis.dts b/arch/arm/dts/fsl-imx8qm-apalis.dts
>> index 5187b794527..0d8d3b3e8e8 100644
>> --- a/arch/arm/dts/fsl-imx8qm-apalis.dts
>> +++ b/arch/arm/dts/fsl-imx8qm-apalis.dts
>> @@ -503,7 +503,7 @@
>> pinctrl-0 = <&pinctrl_fec1>;
>> fsl,magic-packet;
>> phy-handle = <ðphy0>;
>> - phy-mode = "rgmii";
>> + phy-mode = "rgmii-id";
>> phy-reset-duration = <10>;
>> phy-reset-gpios = <&gpio1 11 1>;
>> status = "okay";
>> diff --git a/arch/arm/dts/fsl-imx8qxp-apalis.dts b/arch/arm/dts/fsl-imx8qxp-apalis.dts
>> index 6bd231b2834..9cb3d3a809b 100644
>> --- a/arch/arm/dts/fsl-imx8qxp-apalis.dts
>> +++ b/arch/arm/dts/fsl-imx8qxp-apalis.dts
>> @@ -229,7 +229,7 @@
>> pinctrl-0 = <&pinctrl_fec1>;
>> fsl,magic-packet;
>> phy-handle = <ðphy0>;
>> - phy-mode = "rgmii";
>> + phy-mode = "rgmii-id";
>> phy-reset-duration = <10>;
>> phy-reset-post-delay = <150>;
>> phy-reset-gpios = <&gpio3 4 GPIO_ACTIVE_LOW>;
>> diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
>> index bb55be9a267..73fc5f4c903 100644
>> --- a/drivers/net/fec_mxc.c
>> +++ b/drivers/net/fec_mxc.c
>> @@ -507,15 +507,13 @@ static int fec_open(struct eth_device *edev)
>> writel(readl(&fec->eth->ecntrl) | FEC_ECNTRL_ETHER_EN,
>> &fec->eth->ecntrl);
>>
>> -#ifdef FEC_ENET_ENABLE_TXC_DELAY
>> - writel(readl(&fec->eth->ecntrl) | FEC_ECNTRL_TXC_DLY,
>> - &fec->eth->ecntrl);
>> -#endif
>> + if (fec->interface == PHY_INTERFACE_MODE_RGMII_ID ||
>> + fec->interface == PHY_INTERFACE_MODE_RGMII_TXID)
>> + setbits_le32(&fec->eth->ecntrl, FEC_ECNTRL_TXC_DLY);
>>
>> -#ifdef FEC_ENET_ENABLE_RXC_DELAY
>> - writel(readl(&fec->eth->ecntrl) | FEC_ECNTRL_RXC_DLY,
>> - &fec->eth->ecntrl);
>> -#endif
>> + if (fec->interface == PHY_INTERFACE_MODE_RGMII_ID ||
>> + fec->interface == PHY_INTERFACE_MODE_RGMII_RXID)
>> + setbits_le32(&fec->eth->ecntrl, FEC_ECNTRL_RXC_DLY);
>>
>> #if defined(CONFIG_MX25) || defined(CONFIG_MX53) || defined(CONFIG_MX6SL)
>> udelay(100);
>> diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
>> index db4e9011c0b..81441d7770f 100644
>> --- a/include/configs/apalis-imx8.h
>> +++ b/include/configs/apalis-imx8.h
>> @@ -21,9 +21,6 @@
>> #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
>>
>> /* Networking */
>> -#define FEC_QUIRK_ENET_MAC
>> -#define FEC_ENET_ENABLE_TXC_DELAY
>> -
>> #define CONFIG_TFTP_TSIZE
>>
>> #define CONFIG_IPADDR 192.168.10.2
>> diff --git a/include/configs/apalis-imx8x.h b/include/configs/apalis-imx8x.h
>> index db31c210f50..90bbeb926d3 100644
>> --- a/include/configs/apalis-imx8x.h
>> +++ b/include/configs/apalis-imx8x.h
>> @@ -25,9 +25,6 @@
>> #define CONFIG_NETMASK 255.255.255.0
>> #define CONFIG_SERVERIP 192.168.10.1
>>
>> -#define FEC_ENET_ENABLE_TXC_DELAY
>> -#define FEC_ENET_ENABLE_RXC_DELAY
>> -
>> #define MEM_LAYOUT_ENV_SETTINGS \
>> "kernel_addr_r=0x80280000\0" \
>> "fdt_addr_r=0x83100000\0" \
>> --
>> 2.29.2
>>
>
>
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] net: fec: Get rid of FEC_ENET_ENABLE_[TR]XC_DELAY
2021-01-18 23:57 Marek Vasut
@ 2021-01-20 8:17 ` Oleksandr Suvorov
2021-01-23 12:46 ` Stefano Babic
2021-01-23 15:49 ` sbabic at denx.de
1 sibling, 1 reply; 9+ messages in thread
From: Oleksandr Suvorov @ 2021-01-20 8:17 UTC (permalink / raw)
To: u-boot
Hi Marek,
On Tue, Jan 19, 2021 at 1:57 AM Marek Vasut <marex@denx.de> wrote:
>
> The FEC_ENET_ENABLE_.XC_DELAY setting is only used by one system which
> supports OF control, correctly set the rgmii-id PHY mode in the DT and
> then determine whether or not to enable the FEC RXC/TXC internal delay
> based on the PHY mode.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Thanks & Regards
> Cc: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Ramon Fried <rfried.dev@gmail.com>
> ---
> arch/arm/dts/fsl-imx8qm-apalis.dts | 2 +-
> arch/arm/dts/fsl-imx8qxp-apalis.dts | 2 +-
> drivers/net/fec_mxc.c | 14 ++++++--------
> include/configs/apalis-imx8.h | 3 ---
> include/configs/apalis-imx8x.h | 3 ---
> 5 files changed, 8 insertions(+), 16 deletions(-)
>
> diff --git a/arch/arm/dts/fsl-imx8qm-apalis.dts b/arch/arm/dts/fsl-imx8qm-apalis.dts
> index 5187b794527..0d8d3b3e8e8 100644
> --- a/arch/arm/dts/fsl-imx8qm-apalis.dts
> +++ b/arch/arm/dts/fsl-imx8qm-apalis.dts
> @@ -503,7 +503,7 @@
> pinctrl-0 = <&pinctrl_fec1>;
> fsl,magic-packet;
> phy-handle = <ðphy0>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-id";
> phy-reset-duration = <10>;
> phy-reset-gpios = <&gpio1 11 1>;
> status = "okay";
> diff --git a/arch/arm/dts/fsl-imx8qxp-apalis.dts b/arch/arm/dts/fsl-imx8qxp-apalis.dts
> index 6bd231b2834..9cb3d3a809b 100644
> --- a/arch/arm/dts/fsl-imx8qxp-apalis.dts
> +++ b/arch/arm/dts/fsl-imx8qxp-apalis.dts
> @@ -229,7 +229,7 @@
> pinctrl-0 = <&pinctrl_fec1>;
> fsl,magic-packet;
> phy-handle = <ðphy0>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-id";
> phy-reset-duration = <10>;
> phy-reset-post-delay = <150>;
> phy-reset-gpios = <&gpio3 4 GPIO_ACTIVE_LOW>;
> diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
> index bb55be9a267..73fc5f4c903 100644
> --- a/drivers/net/fec_mxc.c
> +++ b/drivers/net/fec_mxc.c
> @@ -507,15 +507,13 @@ static int fec_open(struct eth_device *edev)
> writel(readl(&fec->eth->ecntrl) | FEC_ECNTRL_ETHER_EN,
> &fec->eth->ecntrl);
>
> -#ifdef FEC_ENET_ENABLE_TXC_DELAY
> - writel(readl(&fec->eth->ecntrl) | FEC_ECNTRL_TXC_DLY,
> - &fec->eth->ecntrl);
> -#endif
> + if (fec->interface == PHY_INTERFACE_MODE_RGMII_ID ||
> + fec->interface == PHY_INTERFACE_MODE_RGMII_TXID)
> + setbits_le32(&fec->eth->ecntrl, FEC_ECNTRL_TXC_DLY);
>
> -#ifdef FEC_ENET_ENABLE_RXC_DELAY
> - writel(readl(&fec->eth->ecntrl) | FEC_ECNTRL_RXC_DLY,
> - &fec->eth->ecntrl);
> -#endif
> + if (fec->interface == PHY_INTERFACE_MODE_RGMII_ID ||
> + fec->interface == PHY_INTERFACE_MODE_RGMII_RXID)
> + setbits_le32(&fec->eth->ecntrl, FEC_ECNTRL_RXC_DLY);
>
> #if defined(CONFIG_MX25) || defined(CONFIG_MX53) || defined(CONFIG_MX6SL)
> udelay(100);
> diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
> index db4e9011c0b..81441d7770f 100644
> --- a/include/configs/apalis-imx8.h
> +++ b/include/configs/apalis-imx8.h
> @@ -21,9 +21,6 @@
> #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
>
> /* Networking */
> -#define FEC_QUIRK_ENET_MAC
> -#define FEC_ENET_ENABLE_TXC_DELAY
> -
> #define CONFIG_TFTP_TSIZE
>
> #define CONFIG_IPADDR 192.168.10.2
> diff --git a/include/configs/apalis-imx8x.h b/include/configs/apalis-imx8x.h
> index db31c210f50..90bbeb926d3 100644
> --- a/include/configs/apalis-imx8x.h
> +++ b/include/configs/apalis-imx8x.h
> @@ -25,9 +25,6 @@
> #define CONFIG_NETMASK 255.255.255.0
> #define CONFIG_SERVERIP 192.168.10.1
>
> -#define FEC_ENET_ENABLE_TXC_DELAY
> -#define FEC_ENET_ENABLE_RXC_DELAY
> -
> #define MEM_LAYOUT_ENV_SETTINGS \
> "kernel_addr_r=0x80280000\0" \
> "fdt_addr_r=0x83100000\0" \
> --
> 2.29.2
>
--
Best regards
Oleksandr Suvorov
Toradex AG
Ebenaustrasse 10 | 6048 Horw | Switzerland | T: +41 41 500 48 00
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] net: fec: Get rid of FEC_ENET_ENABLE_[TR]XC_DELAY
@ 2021-01-18 23:57 Marek Vasut
2021-01-20 8:17 ` Oleksandr Suvorov
2021-01-23 15:49 ` sbabic at denx.de
0 siblings, 2 replies; 9+ messages in thread
From: Marek Vasut @ 2021-01-18 23:57 UTC (permalink / raw)
To: u-boot
The FEC_ENET_ENABLE_.XC_DELAY setting is only used by one system which
supports OF control, correctly set the rgmii-id PHY mode in the DT and
then determine whether or not to enable the FEC RXC/TXC internal delay
based on the PHY mode.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Ramon Fried <rfried.dev@gmail.com>
---
arch/arm/dts/fsl-imx8qm-apalis.dts | 2 +-
arch/arm/dts/fsl-imx8qxp-apalis.dts | 2 +-
drivers/net/fec_mxc.c | 14 ++++++--------
include/configs/apalis-imx8.h | 3 ---
include/configs/apalis-imx8x.h | 3 ---
5 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/arch/arm/dts/fsl-imx8qm-apalis.dts b/arch/arm/dts/fsl-imx8qm-apalis.dts
index 5187b794527..0d8d3b3e8e8 100644
--- a/arch/arm/dts/fsl-imx8qm-apalis.dts
+++ b/arch/arm/dts/fsl-imx8qm-apalis.dts
@@ -503,7 +503,7 @@
pinctrl-0 = <&pinctrl_fec1>;
fsl,magic-packet;
phy-handle = <ðphy0>;
- phy-mode = "rgmii";
+ phy-mode = "rgmii-id";
phy-reset-duration = <10>;
phy-reset-gpios = <&gpio1 11 1>;
status = "okay";
diff --git a/arch/arm/dts/fsl-imx8qxp-apalis.dts b/arch/arm/dts/fsl-imx8qxp-apalis.dts
index 6bd231b2834..9cb3d3a809b 100644
--- a/arch/arm/dts/fsl-imx8qxp-apalis.dts
+++ b/arch/arm/dts/fsl-imx8qxp-apalis.dts
@@ -229,7 +229,7 @@
pinctrl-0 = <&pinctrl_fec1>;
fsl,magic-packet;
phy-handle = <ðphy0>;
- phy-mode = "rgmii";
+ phy-mode = "rgmii-id";
phy-reset-duration = <10>;
phy-reset-post-delay = <150>;
phy-reset-gpios = <&gpio3 4 GPIO_ACTIVE_LOW>;
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index bb55be9a267..73fc5f4c903 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -507,15 +507,13 @@ static int fec_open(struct eth_device *edev)
writel(readl(&fec->eth->ecntrl) | FEC_ECNTRL_ETHER_EN,
&fec->eth->ecntrl);
-#ifdef FEC_ENET_ENABLE_TXC_DELAY
- writel(readl(&fec->eth->ecntrl) | FEC_ECNTRL_TXC_DLY,
- &fec->eth->ecntrl);
-#endif
+ if (fec->interface == PHY_INTERFACE_MODE_RGMII_ID ||
+ fec->interface == PHY_INTERFACE_MODE_RGMII_TXID)
+ setbits_le32(&fec->eth->ecntrl, FEC_ECNTRL_TXC_DLY);
-#ifdef FEC_ENET_ENABLE_RXC_DELAY
- writel(readl(&fec->eth->ecntrl) | FEC_ECNTRL_RXC_DLY,
- &fec->eth->ecntrl);
-#endif
+ if (fec->interface == PHY_INTERFACE_MODE_RGMII_ID ||
+ fec->interface == PHY_INTERFACE_MODE_RGMII_RXID)
+ setbits_le32(&fec->eth->ecntrl, FEC_ECNTRL_RXC_DLY);
#if defined(CONFIG_MX25) || defined(CONFIG_MX53) || defined(CONFIG_MX6SL)
udelay(100);
diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index db4e9011c0b..81441d7770f 100644
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -21,9 +21,6 @@
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
/* Networking */
-#define FEC_QUIRK_ENET_MAC
-#define FEC_ENET_ENABLE_TXC_DELAY
-
#define CONFIG_TFTP_TSIZE
#define CONFIG_IPADDR 192.168.10.2
diff --git a/include/configs/apalis-imx8x.h b/include/configs/apalis-imx8x.h
index db31c210f50..90bbeb926d3 100644
--- a/include/configs/apalis-imx8x.h
+++ b/include/configs/apalis-imx8x.h
@@ -25,9 +25,6 @@
#define CONFIG_NETMASK 255.255.255.0
#define CONFIG_SERVERIP 192.168.10.1
-#define FEC_ENET_ENABLE_TXC_DELAY
-#define FEC_ENET_ENABLE_RXC_DELAY
-
#define MEM_LAYOUT_ENV_SETTINGS \
"kernel_addr_r=0x80280000\0" \
"fdt_addr_r=0x83100000\0" \
--
2.29.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-01-24 17:14 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-23 19:57 [PATCH] net: fec: Get rid of FEC_ENET_ENABLE_[TR]XC_DELAY Marek Vasut
2021-01-23 22:04 ` Stefano Babic
2021-01-24 14:35 ` Oleksandr Suvorov
2021-01-24 14:52 ` Marek Vasut
2021-01-24 17:14 ` Oleksandr Suvorov
-- strict thread matches above, loose matches on Subject: below --
2021-01-18 23:57 Marek Vasut
2021-01-20 8:17 ` Oleksandr Suvorov
2021-01-23 12:46 ` Stefano Babic
2021-01-23 15:49 ` sbabic at denx.de
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.