From 8b10decf76e0496abdaaf3e921c0d1e91793bfcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= Date: Wed, 7 Dec 2011 21:59:30 +0000 Subject: [PATCH] --- yaml --- r: 278523 b: refs/heads/master c: 42431dc24de343d62bb8fb885586de7f408919c8 h: refs/heads/master i: 278521: 737289f99715b8bcd8de198aba61778838b1a76b 278519: 9222277e15276312881b956ac4bb10137ba4fd4b v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/freescale/fec.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2ac9fc46604a..d2a154bb4fd8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 589efdc7f7327bc8ddf597bdaf9de38fcea31744 +refs/heads/master: 42431dc24de343d62bb8fb885586de7f408919c8 diff --git a/trunk/drivers/net/ethernet/freescale/fec.c b/trunk/drivers/net/ethernet/freescale/fec.c index 11534b9c6b39..ab0afb5961f6 100644 --- a/trunk/drivers/net/ethernet/freescale/fec.c +++ b/trunk/drivers/net/ethernet/freescale/fec.c @@ -515,6 +515,7 @@ fec_stop(struct net_device *ndev) struct fec_enet_private *fep = netdev_priv(ndev); const struct platform_device_id *id_entry = platform_get_device_id(fep->pdev); + u32 rmii_mode = readl(fep->hwp + FEC_R_CNTRL) & (1 << 8); /* We cannot expect a graceful transmit stop without link !!! */ if (fep->link) { @@ -531,8 +532,10 @@ fec_stop(struct net_device *ndev) writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK); /* We have to keep ENET enabled to have MII interrupt stay working */ - if (id_entry->driver_data & FEC_QUIRK_ENET_MAC) + if (id_entry->driver_data & FEC_QUIRK_ENET_MAC) { writel(2, fep->hwp + FEC_ECNTRL); + writel(rmii_mode, fep->hwp + FEC_R_CNTRL); + } }