diff options
| author | Vinod Koul <vkoul@kernel.org> | 2020-09-11 14:15:36 +0200 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2020-09-11 14:15:36 +0200 |
| commit | 4c80e9323967125ab8aa7c271ccc7624abc08832 (patch) | |
| tree | c9881b5814c184aa0c1cb58c6383beab9173e388 /drivers/net/ethernet/ti/am65-cpsw-nuss.c | |
| parent | dmaengine: dmatest: Print error codes as signed value (diff) | |
| parent | Linux 5.9-rc4 (diff) | |
| download | linux-4c80e9323967125ab8aa7c271ccc7624abc08832.tar.xz linux-4c80e9323967125ab8aa7c271ccc7624abc08832.zip | |
Merge tag 'v5.9-rc4' into next
Linux 5.9-rc4
Diffstat (limited to 'drivers/net/ethernet/ti/am65-cpsw-nuss.c')
| -rw-r--r-- | drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c index cb994f66c3be..9baf3f3da91e 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -174,6 +174,8 @@ void am65_cpsw_nuss_adjust_link(struct net_device *ndev) if (phy->speed == 10 && phy_interface_is_rgmii(phy)) /* Can be used with in band mode only */ mac_control |= CPSW_SL_CTL_EXT_EN; + if (phy->speed == 100 && phy->interface == PHY_INTERFACE_MODE_RMII) + mac_control |= CPSW_SL_CTL_IFCTL_A; if (phy->duplex) mac_control |= CPSW_SL_CTL_FULLDUPLEX; |