net: ethernet: fs_enet: use macros for speed and duplex values
The PHY speed and duplex should be manipulated using the SPEED_XXX and DUPLEX_XXX macros available. Use it in the fcc, fec and scc MAC for fs_enet. Acked-by: Christophe Leroy <christophe.leroy@csgroup.eu> Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
6b576b2d44
commit
21c6321459
@@ -360,7 +360,7 @@ static void restart(struct net_device *dev)
|
||||
|
||||
/* adjust to speed (for RMII mode) */
|
||||
if (fpi->use_rmii) {
|
||||
if (dev->phydev->speed == 100)
|
||||
if (dev->phydev->speed == SPEED_100)
|
||||
C8(fcccp, fcc_gfemr, 0x20);
|
||||
else
|
||||
S8(fcccp, fcc_gfemr, 0x20);
|
||||
@@ -386,7 +386,7 @@ static void restart(struct net_device *dev)
|
||||
S32(fccp, fcc_fpsmr, FCC_PSMR_RMII);
|
||||
|
||||
/* adjust to duplex mode */
|
||||
if (dev->phydev->duplex)
|
||||
if (dev->phydev->duplex == DUPLEX_FULL)
|
||||
S32(fccp, fcc_fpsmr, FCC_PSMR_FDE | FCC_PSMR_LPB);
|
||||
else
|
||||
C32(fccp, fcc_fpsmr, FCC_PSMR_FDE | FCC_PSMR_LPB);
|
||||
|
||||
@@ -308,7 +308,7 @@ static void restart(struct net_device *dev)
|
||||
/*
|
||||
* adjust to duplex mode
|
||||
*/
|
||||
if (dev->phydev->duplex) {
|
||||
if (dev->phydev->duplex == DUPLEX_FULL) {
|
||||
FC(fecp, r_cntrl, FEC_RCNTRL_DRT);
|
||||
FS(fecp, x_cntrl, FEC_TCNTRL_FDEN); /* FD enable */
|
||||
} else {
|
||||
|
||||
@@ -337,7 +337,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)
|
||||
if (dev->phydev->duplex == DUPLEX_FULL)
|
||||
S16(sccp, scc_psmr, SCC_PSMR_LPB | SCC_PSMR_FDE);
|
||||
|
||||
/* Restore multicast and promiscuous settings */
|
||||
|
||||
Reference in New Issue
Block a user