summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJim Baxter <jim_baxter@mentor.com>2013-07-01 14:57:54 +0100
committerJason Liu <r64343@freescale.com>2013-08-23 07:30:06 +0800
commitb431856e717015a9d2797541fec775773fd39e30 (patch)
treee176987c811d18c7016dd88481016b7a0ed4cb8a /drivers
parent24732e8014e8a39647c46d362111ad02e424f550 (diff)
net: fec: Fix RMON registers on imx6
commit 38ae92d "fec: Add support for reading RMON registers" causes the imx6Q to crash. This fixes it by only enabling the RMON registers, the registers are already cleared by the MAC being reset. Signed-off-by: Jim Baxter <jim_baxter@mentor.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/freescale/fec_main.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 46f5364774e8..58e9089d8675 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -610,11 +610,8 @@ fec_restart(struct net_device *ndev, int duplex)
ecntl |= (1 << 4);
#ifndef CONFIG_M5272
- /* Disable, clear, and enable the MIB */
- writel(1 << 31, fep->hwp + FEC_MIB_CTRLSTAT);
- for (i = RMON_T_DROP; i < IEEE_R_OCTETS_OK; i++)
- writel(0, fep->hwp + i);
- writel(0, fep->hwp + FEC_MIB_CTRLSTAT);
+ /* Enable the MIB statistic event counters */
+ writel(0 << 31, fep->hwp + FEC_MIB_CTRLSTAT);
#endif
/* And last, enable the transmit and receive processing */