Commit 0a96806b authored by Dave Jones's avatar Dave Jones Committed by Jeff Garzik

Merge au1000_eth net drvr updates from 2.4.x:

* add support for LSI 10/100 phy
* other minor cleanups
parent af04d868
This diff is collapsed.
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#define ETH_TX_TIMEOUT HZ/4 #define ETH_TX_TIMEOUT HZ/4
#define MAC_MIN_PKT_SIZE 64 #define MAC_MIN_PKT_SIZE 64
#ifdef CONFIG_MIPS_PB1000 #if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1500)
#define PHY_ADDRESS 0 #define PHY_ADDRESS 0
#define PHY_CONTROL_DEFAULT 0x3000 #define PHY_CONTROL_DEFAULT 0x3000
#define PHY_CONTROL_REG_ADDR 0 #define PHY_CONTROL_REG_ADDR 0
...@@ -60,7 +60,9 @@ ...@@ -60,7 +60,9 @@
#define MII_ANLPAR 0x0005 #define MII_ANLPAR 0x0005
#define MII_AEXP 0x0006 #define MII_AEXP 0x0006
#define MII_ANEXT 0x0007 #define MII_ANEXT 0x0007
#define MII_AUX_CNTRL 0x18 #define MII_LSI_CONFIG 0x0011
#define MII_LSI_STAT 0x0012
#define MII_AUX_CNTRL 0x0018
/* mii registers specific to AMD 79C901 */ /* mii registers specific to AMD 79C901 */
#define MII_STATUS_SUMMARY = 0x0018 #define MII_STATUS_SUMMARY = 0x0018
...@@ -124,6 +126,11 @@ ...@@ -124,6 +126,11 @@
#define MII_STSSUM_AUTO 0x0002 #define MII_STSSUM_AUTO 0x0002
#define MII_STSSUM_SPD 0x0001 #define MII_STSSUM_SPD 0x0001
/* lsi status register */
#define MII_LSI_STAT_FDX 0x0008
#define MII_LSI_STAT_SPD 0x0010
/* Auxilliary Control/Status Register */ /* Auxilliary Control/Status Register */
#define MII_AUX_FDX 0x0001 #define MII_AUX_FDX 0x0001
#define MII_AUX_100 0x0002 #define MII_AUX_100 0x0002
......
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