From: Florian Fainelli Date: Wed, 4 Jan 2012 08:59:36 +0000 (+0000) Subject: r6040: use definitions for MAC_SM register read/writes X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e1477637967d0d8db3083bacb241c796c3c4f23b;p=openwrt%2Fstaging%2Fblogic.git 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 Signed-off-by: David S. Miller --- 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);