genesi/linux-legacy
1
0
Fork 0
mirror of https://github.com/genesi/linux-legacy.git synced 2026-09-23 07:04:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENGR00123296 MX5: Fix FEC compiling error

Browse Source 
1. One variable declaration was controlled by ARCH_MXS, but it was
used by other platforms, So remove the ARCH_MXS flags controlling.
2. Added judgement for FEC 1588 interrupt enablement.

Signed-off-by: Xie Xiaobo <X.Xie@freescale.com>
This commit is contained in:
Xie Xiaobo
2010-05-10 11:31:21 +08:00
committed by Matt Sealey
parent 9e4ac5e73b
commit 19bb66e24a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/fec.c
View File

@@ -1247,9 +1247,8 @@ fec_restart(struct net_device *dev, int duplex)
int i;
uint ret = 0;
u32 temp_mac[2];
#ifdef CONFIG_ARCH_MXS
unsigned long reg;
#endif
/* Whack a reset. We should wait for this. */
writel(1, fep->hwp + FEC_ECNTRL);
udelay(10);
@@ -1368,8 +1367,11 @@ fec_restart(struct net_device *dev, int duplex)
writel(0, fep->hwp + FEC_R_DES_ACTIVE);
/* Enable interrupts we wish to service */
writel(FEC_ENET_TXF | FEC_ENET_RXF | FEC_ENET_TS_AVAIL |
FEC_ENET_TS_TIMER, fep->hwp + FEC_IMASK);
if (fep->ptimer_present)
writel(FEC_ENET_TXF | FEC_ENET_RXF | FEC_ENET_TS_AVAIL |
FEC_ENET_TS_TIMER, fep->hwp + FEC_IMASK);
else
writel(FEC_ENET_TXF | FEC_ENET_RXF, fep->hwp + FEC_IMASK);
}
static void