aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
diff options
context:
space:
mode:
authorMaxime Chevallier <maxime.chevallier@bootlin.com>2024-09-04 19:18:21 +0200
committerDavid S. Miller <davem@davemloft.net>2024-09-09 10:29:04 +0100
commit41f5fbffd177785e9432e7b2d30bc83b06e6e65d (patch)
treeb0d73babc46f616d5fdd98aa2463a0dd5122a7e1 /drivers/net/ethernet/freescale/fs_enet/mac-scc.c
parentc614acf6e8e175694db7ea21f3ddca6e075680fd (diff)
downloadlinux-41f5fbffd177785e9432e7b2d30bc83b06e6e65d.tar.gz
linux-41f5fbffd177785e9432e7b2d30bc83b06e6e65d.tar.bz2
linux-41f5fbffd177785e9432e7b2d30bc83b06e6e65d.zip
net: ethernet: fs_enet: phylink conversion
fs_enet is a quite old but still used Ethernet driver found on some NXP devices. It has support for 10/100 Mbps ethernet, with half and full duplex. Some variants of it can use RMII, while other integrations are MII-only. Add phylink support, thus removing custom fixed-link hanldling. This also allows removing some internal flags such as the use_rmii flag. Acked-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale/fs_enet/mac-scc.c')
-rw-r--r--drivers/net/ethernet/freescale/fs_enet/mac-scc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-scc.c b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
index d061092ced6c..6c97191649de 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
@@ -226,7 +226,8 @@ static void set_multicast_list(struct net_device *dev)
* change. This only happens when switching between half and full
* duplex.
*/
-static void restart(struct net_device *dev)
+static void restart(struct net_device *dev, phy_interface_t interface,
+ int speed, int duplex)
{
struct fs_enet_private *fep = netdev_priv(dev);
scc_t __iomem *sccp = fep->scc.sccp;
@@ -337,7 +338,7 @@ static void restart(struct net_device *dev)
W16(sccp, scc_psmr, SCC_PSMR_ENCRC | SCC_PSMR_NIB22);
/* Set full duplex mode if needed */
- if (dev->phydev->duplex == DUPLEX_FULL)
+ if (duplex == DUPLEX_FULL)
S16(sccp, scc_psmr, SCC_PSMR_LPB | SCC_PSMR_FDE);
/* Restore multicast and promiscuous settings */