diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-01-04 03:59:36 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-04 15:55:53 -0500 |
| commit | e1477637967d0d8db3083bacb241c796c3c4f23b (patch) | |
| tree | 53675641c243d74fc7fb7d4a5a00a44a97a597fe /drivers/net/ethernet/rdc | |
| parent | 58dbc691e6ca6689402424db60f4a54745a38c67 (diff) | |
r6040: use definitions for MAC_SM register read/writes
Bit 1 is the reset bit of the MAC status machine register, define and
use it.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/rdc')
| -rw-r--r-- | drivers/net/ethernet/rdc/r6040.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c index 4665a3932b98..e9054a9e5ec3 100644 --- a/drivers/net/ethernet/rdc/r6040.c +++ b/drivers/net/ethernet/rdc/r6040.c | |||
| @@ -126,6 +126,7 @@ | |||
| 126 | #define PHY_CC 0x88 /* PHY status change configuration register */ | 126 | #define PHY_CC 0x88 /* PHY status change configuration register */ |
| 127 | #define PHY_ST 0x8A /* PHY status register */ | 127 | #define PHY_ST 0x8A /* PHY status register */ |
| 128 | #define MAC_SM 0xAC /* MAC status machine */ | 128 | #define MAC_SM 0xAC /* MAC status machine */ |
| 129 | #define MAC_SM_RST 0x0002 /* MAC status machine reset */ | ||
| 129 | #define MAC_ID 0xBE /* Identifier register */ | 130 | #define MAC_ID 0xBE /* Identifier register */ |
| 130 | 131 | ||
| 131 | #define TX_DCNT 0x80 /* TX descriptor count */ | 132 | #define TX_DCNT 0x80 /* TX descriptor count */ |
| @@ -375,7 +376,7 @@ static void r6040_init_mac_regs(struct net_device *dev) | |||
| 375 | break; | 376 | break; |
| 376 | } | 377 | } |
| 377 | /* Reset internal state machine */ | 378 | /* Reset internal state machine */ |
| 378 | iowrite16(2, ioaddr + MAC_SM); | 379 | iowrite16(MAC_SM_RST, ioaddr + MAC_SM); |
| 379 | iowrite16(0, ioaddr + MAC_SM); | 380 | iowrite16(0, ioaddr + MAC_SM); |
| 380 | mdelay(5); | 381 | mdelay(5); |
| 381 | 382 | ||
| @@ -736,7 +737,7 @@ static void r6040_mac_address(struct net_device *dev) | |||
| 736 | 737 | ||
| 737 | /* MAC operation register */ | 738 | /* MAC operation register */ |
| 738 | iowrite16(MAC_RST, ioaddr + MCR1); /* Reset MAC */ | 739 | iowrite16(MAC_RST, ioaddr + MCR1); /* Reset MAC */ |
| 739 | iowrite16(2, ioaddr + MAC_SM); /* Reset internal state machine */ | 740 | iowrite16(MAC_SM_RST, ioaddr + MAC_SM); /* Reset internal state machine */ |
| 740 | iowrite16(0, ioaddr + MAC_SM); | 741 | iowrite16(0, ioaddr + MAC_SM); |
| 741 | mdelay(5); | 742 | mdelay(5); |
| 742 | 743 | ||
