diff options
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
-rw-r--r-- | drivers/net/mv643xx_eth.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index bcc891dd84f..6324556ccb6 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c | |||
@@ -103,6 +103,7 @@ static char mv643xx_driver_version[] = "1.0"; | |||
103 | #define SDMA_CONFIG(p) (0x041c + ((p) << 10)) | 103 | #define SDMA_CONFIG(p) (0x041c + ((p) << 10)) |
104 | #define PORT_SERIAL_CONTROL(p) (0x043c + ((p) << 10)) | 104 | #define PORT_SERIAL_CONTROL(p) (0x043c + ((p) << 10)) |
105 | #define PORT_STATUS(p) (0x0444 + ((p) << 10)) | 105 | #define PORT_STATUS(p) (0x0444 + ((p) << 10)) |
106 | #define TX_FIFO_EMPTY 0x00000400 | ||
106 | #define TXQ_COMMAND(p) (0x0448 + ((p) << 10)) | 107 | #define TXQ_COMMAND(p) (0x0448 + ((p) << 10)) |
107 | #define TX_BW_MTU(p) (0x0458 + ((p) << 10)) | 108 | #define TX_BW_MTU(p) (0x0458 + ((p) << 10)) |
108 | #define INT_CAUSE(p) (0x0460 + ((p) << 10)) | 109 | #define INT_CAUSE(p) (0x0460 + ((p) << 10)) |
@@ -169,18 +170,6 @@ static char mv643xx_driver_version[] = "1.0"; | |||
169 | #define PORT_DEFAULT_TRANSMIT_QUEUE_SIZE 800 | 170 | #define PORT_DEFAULT_TRANSMIT_QUEUE_SIZE 800 |
170 | #define PORT_DEFAULT_RECEIVE_QUEUE_SIZE 400 | 171 | #define PORT_DEFAULT_RECEIVE_QUEUE_SIZE 400 |
171 | 172 | ||
172 | /* Port serial status reg (PSR) */ | ||
173 | #define ETH_INTERFACE_PCM 0x00000001 | ||
174 | #define ETH_LINK_IS_UP 0x00000002 | ||
175 | #define ETH_PORT_AT_FULL_DUPLEX 0x00000004 | ||
176 | #define ETH_RX_FLOW_CTRL_ENABLED 0x00000008 | ||
177 | #define ETH_GMII_SPEED_1000 0x00000010 | ||
178 | #define ETH_MII_SPEED_100 0x00000020 | ||
179 | #define ETH_TX_IN_PROGRESS 0x00000080 | ||
180 | #define ETH_BYPASS_ACTIVE 0x00000100 | ||
181 | #define ETH_PORT_AT_PARTITION_STATE 0x00000200 | ||
182 | #define ETH_PORT_TX_FIFO_EMPTY 0x00000400 | ||
183 | |||
184 | /* SMI reg */ | 173 | /* SMI reg */ |
185 | #define ETH_SMI_BUSY 0x10000000 /* 0 - Write, 1 - Read */ | 174 | #define ETH_SMI_BUSY 0x10000000 /* 0 - Write, 1 - Read */ |
186 | #define ETH_SMI_READ_VALID 0x08000000 /* 0 - Write, 1 - Read */ | 175 | #define ETH_SMI_READ_VALID 0x08000000 /* 0 - Write, 1 - Read */ |
@@ -471,7 +460,7 @@ static unsigned int mv643xx_eth_port_disable_tx(struct mv643xx_private *mp) | |||
471 | udelay(10); | 460 | udelay(10); |
472 | 461 | ||
473 | /* Wait for Tx FIFO to empty */ | 462 | /* Wait for Tx FIFO to empty */ |
474 | while (rdl(mp, PORT_STATUS(port_num)) & ETH_PORT_TX_FIFO_EMPTY) | 463 | while (rdl(mp, PORT_STATUS(port_num)) & TX_FIFO_EMPTY) |
475 | udelay(10); | 464 | udelay(10); |
476 | } | 465 | } |
477 | 466 | ||