summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Baxter <jim_baxter@mentor.com>2013-07-01 14:57:54 +0100
committerDavid S. Miller <davem@davemloft.net>2013-07-02 12:40:52 -0700
commitb9eef55c2ab33053ae236b5d383965f9ee6a0094 (patch)
treefc22d73bb925e1fd4face8b9101debf3962185ca
parent7cc47d139f9a815a91bd9e7377063238c69a0423 (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>
-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 aff8a5cd17c7..b6768821757b 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -606,11 +606,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 */