mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-07 23:20:32 -04:00
Revert "net: ethernet: fec: Prevent MII event after MII_SPEED write"
This reverts commit 790ab249b5.
This change needs more work.
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -996,9 +996,6 @@ fec_restart(struct net_device *ndev)
|
||||
writel(0x0, fep->hwp + FEC_X_CNTRL);
|
||||
}
|
||||
|
||||
/* Prevent an MII event being report when changing speed */
|
||||
writel(0, fep->hwp + FEC_MII_DATA);
|
||||
|
||||
/* Set MII speed */
|
||||
writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
|
||||
|
||||
@@ -1185,10 +1182,6 @@ fec_stop(struct net_device *ndev)
|
||||
writel(val, fep->hwp + FEC_ECNTRL);
|
||||
fec_enet_stop_mode(fep, true);
|
||||
}
|
||||
|
||||
/* Prevent an MII event being report when changing speed */
|
||||
writel(0, fep->hwp + FEC_MII_DATA);
|
||||
|
||||
writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
|
||||
|
||||
/* We have to keep ENET enabled to have MII interrupt stay working */
|
||||
@@ -2149,16 +2142,6 @@ static int fec_enet_mii_init(struct platform_device *pdev)
|
||||
if (suppress_preamble)
|
||||
fep->phy_speed |= BIT(7);
|
||||
|
||||
/* Clear MMFR to avoid to generate MII event by writing MSCR.
|
||||
* MII event generation condition:
|
||||
* - writing MSCR:
|
||||
* - mmfr[31:0]_not_zero & mscr[7:0]_is_zero &
|
||||
* mscr_reg_data_in[7:0] != 0
|
||||
* - writing MMFR:
|
||||
* - mscr[7:0]_not_zero
|
||||
*/
|
||||
writel(0, fep->hwp + FEC_MII_DATA);
|
||||
|
||||
writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
|
||||
|
||||
/* Clear any pending transaction complete indication */
|
||||
|
||||
Reference in New Issue
Block a user