diff options
| author |   Florian Fainelli <florian@openwrt.org> | 2012-01-04 08:59:36 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-01-04 15:55:53 -0500 |
| commit | e1477637967d0d8db3083bacb241c796c3c4f23b (patch) | |
| tree | 53675641c243d74fc7fb7d4a5a00a44a97a597fe /drivers/net/ethernet/rdc/r6040.c | |
| parent | r6040: use MAC_RST bit definition with MCR1 read/writes (diff) | |
| download | linux-dev-e1477637967d0d8db3083bacb241c796c3c4f23b.tar.xz linux-dev-e1477637967d0d8db3083bacb241c796c3c4f23b.zip | |
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/r6040.c')
| -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 @@ #define PHY_CC 0x88 /* PHY status change configuration register */ #define PHY_ST 0x8A /* PHY status register */ #define MAC_SM 0xAC /* MAC status machine */ +#define MAC_SM_RST 0x0002 /* MAC status machine reset */ #define MAC_ID 0xBE /* Identifier register */ #define TX_DCNT 0x80 /* TX descriptor count */ @@ -375,7 +376,7 @@ static void r6040_init_mac_regs(struct net_device *dev) break; } /* Reset internal state machine */ - iowrite16(2, ioaddr + MAC_SM); + iowrite16(MAC_SM_RST, ioaddr + MAC_SM); iowrite16(0, ioaddr + MAC_SM); mdelay(5); @@ -736,7 +737,7 @@ static void r6040_mac_address(struct net_device *dev) /* MAC operation register */ iowrite16(MAC_RST, ioaddr + MCR1); /* Reset MAC */ - iowrite16(2, ioaddr + MAC_SM); /* Reset internal state machine */ + iowrite16(MAC_SM_RST, ioaddr + MAC_SM); /* Reset internal state machine */ iowrite16(0, ioaddr + MAC_SM); mdelay(5); |