Commit e1477637 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

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: default avatarFlorian Fainelli <florian@openwrt.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 58dbc691
...@@ -126,6 +126,7 @@ ...@@ -126,6 +126,7 @@
#define PHY_CC 0x88 /* PHY status change configuration register */ #define PHY_CC 0x88 /* PHY status change configuration register */
#define PHY_ST 0x8A /* PHY status register */ #define PHY_ST 0x8A /* PHY status register */
#define MAC_SM 0xAC /* MAC status machine */ #define MAC_SM 0xAC /* MAC status machine */
#define MAC_SM_RST 0x0002 /* MAC status machine reset */
#define MAC_ID 0xBE /* Identifier register */ #define MAC_ID 0xBE /* Identifier register */
#define TX_DCNT 0x80 /* TX descriptor count */ #define TX_DCNT 0x80 /* TX descriptor count */
...@@ -375,7 +376,7 @@ static void r6040_init_mac_regs(struct net_device *dev) ...@@ -375,7 +376,7 @@ static void r6040_init_mac_regs(struct net_device *dev)
break; break;
} }
/* Reset internal state machine */ /* Reset internal state machine */
iowrite16(2, ioaddr + MAC_SM); iowrite16(MAC_SM_RST, ioaddr + MAC_SM);
iowrite16(0, ioaddr + MAC_SM); iowrite16(0, ioaddr + MAC_SM);
mdelay(5); mdelay(5);
...@@ -736,7 +737,7 @@ static void r6040_mac_address(struct net_device *dev) ...@@ -736,7 +737,7 @@ static void r6040_mac_address(struct net_device *dev)
/* MAC operation register */ /* MAC operation register */
iowrite16(MAC_RST, ioaddr + MCR1); /* Reset MAC */ 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); iowrite16(0, ioaddr + MAC_SM);
mdelay(5); mdelay(5);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment