diff options
| author | Greg Ungerer <gerg@snapgear.com> | 2007-07-30 16:29:16 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-30 10:52:09 -0700 |
| commit | f861d62e12d3f732a36634e9e6b3b7b0112fef60 (patch) | |
| tree | 3bc418ce7c69b7f0fbd58c09ad89cf07a82a6212 | |
| parent | cb84d6e7ad10bd679df1787a1fc9624432a73317 (diff) | |
| download | blackbird-op-linux-f861d62e12d3f732a36634e9e6b3b7b0112fef60.tar.gz blackbird-op-linux-f861d62e12d3f732a36634e9e6b3b7b0112fef60.zip | |
clean up reading of ICR register in FEC driver
On the MCF5272, there is no need to read the ICR before writing it :
the bit 4n+3 is a write-enable for the bits 4n,4n+1 and 4n+2.
Signed-off-by: Philippe De Muyter <phdm@macqel.be>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/net/fec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 91daf0785ee8..ff7e449ad573 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -1270,7 +1270,7 @@ static void __inline__ fec_request_intrs(struct net_device *dev) icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR3); *icrp = 0x00000ddd; icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1); - *icrp = (*icrp & 0x70777777) | 0x0d000000; + *icrp = 0x0d000000; } static void __inline__ fec_set_mii(struct net_device *dev, struct fec_enet_private *fep) @@ -1332,7 +1332,7 @@ static void __inline__ fec_disable_phy_intr(void) { volatile unsigned long *icrp; icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1); - *icrp = (*icrp & 0x70777777) | 0x08000000; + *icrp = 0x08000000; } static void __inline__ fec_phy_ack_intr(void) @@ -1340,7 +1340,7 @@ static void __inline__ fec_phy_ack_intr(void) volatile unsigned long *icrp; /* Acknowledge the interrupt */ icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1); - *icrp = (*icrp & 0x77777777) | 0x08000000; + *icrp = 0x0d000000; } static void __inline__ fec_localhw_setup(void) |
