aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ixp2000/pm3386.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/net/ixp2000/pm3386.c b/drivers/net/ixp2000/pm3386.c
index df960f1710f6..b8a59b9bedb4 100644
--- a/drivers/net/ixp2000/pm3386.c
+++ b/drivers/net/ixp2000/pm3386.c
@@ -166,9 +166,7 @@ void pm3386_init_port(int port)
166 * Soft reset the EGMAC block. 166 * Soft reset the EGMAC block.
167 */ 167 */
168 pm3386_port_reg_write(port, 0x301, 0x100, 0x8000); 168 pm3386_port_reg_write(port, 0x301, 0x100, 0x8000);
169 udelay(10);
170 pm3386_port_reg_write(port, 0x301, 0x100, 0x0000); 169 pm3386_port_reg_write(port, 0x301, 0x100, 0x0000);
171 udelay(10);
172 170
173 /* 171 /*
174 * Auto-sense autonegotiation status. 172 * Auto-sense autonegotiation status.
@@ -191,15 +189,12 @@ void pm3386_init_port(int port)
191 * Set autonegotiation parameters to 'no PAUSE, full duplex.' 189 * Set autonegotiation parameters to 'no PAUSE, full duplex.'
192 */ 190 */
193 pm3386_port_reg_write(port, 0x31c, 0x100, 0x0020); 191 pm3386_port_reg_write(port, 0x31c, 0x100, 0x0020);
194 udelay(10);
195 192
196 /* 193 /*
197 * Enable and restart autonegotiation. 194 * Enable and restart autonegotiation.
198 */ 195 */
199 pm3386_port_reg_write(port, 0x318, 0x100, 0x0003); 196 pm3386_port_reg_write(port, 0x318, 0x100, 0x0003);
200 udelay(1000);
201 pm3386_port_reg_write(port, 0x318, 0x100, 0x0002); 197 pm3386_port_reg_write(port, 0x318, 0x100, 0x0002);
202 udelay(10);
203} 198}
204 199
205void pm3386_get_mac(int port, u8 *mac) 200void pm3386_get_mac(int port, u8 *mac)
@@ -264,8 +259,6 @@ void pm3386_enable_rx(int port)
264 temp = pm3386_port_reg_read(port, 0x303, 0x100); 259 temp = pm3386_port_reg_read(port, 0x303, 0x100);
265 temp |= 0x1000; 260 temp |= 0x1000;
266 pm3386_port_reg_write(port, 0x303, 0x100, temp); 261 pm3386_port_reg_write(port, 0x303, 0x100, temp);
267
268 udelay(10);
269} 262}
270 263
271void pm3386_disable_rx(int port) 264void pm3386_disable_rx(int port)
@@ -275,8 +268,6 @@ void pm3386_disable_rx(int port)
275 temp = pm3386_port_reg_read(port, 0x303, 0x100); 268 temp = pm3386_port_reg_read(port, 0x303, 0x100);
276 temp &= 0xefff; 269 temp &= 0xefff;
277 pm3386_port_reg_write(port, 0x303, 0x100, temp); 270 pm3386_port_reg_write(port, 0x303, 0x100, temp);
278
279 udelay(10);
280} 271}
281 272
282void pm3386_enable_tx(int port) 273void pm3386_enable_tx(int port)
@@ -286,8 +277,6 @@ void pm3386_enable_tx(int port)
286 temp = pm3386_port_reg_read(port, 0x303, 0x100); 277 temp = pm3386_port_reg_read(port, 0x303, 0x100);
287 temp |= 0x4000; 278 temp |= 0x4000;
288 pm3386_port_reg_write(port, 0x303, 0x100, temp); 279 pm3386_port_reg_write(port, 0x303, 0x100, temp);
289
290 udelay(10);
291} 280}
292 281
293void pm3386_disable_tx(int port) 282void pm3386_disable_tx(int port)
@@ -297,8 +286,6 @@ void pm3386_disable_tx(int port)
297 temp = pm3386_port_reg_read(port, 0x303, 0x100); 286 temp = pm3386_port_reg_read(port, 0x303, 0x100);
298 temp &= 0xbfff; 287 temp &= 0xbfff;
299 pm3386_port_reg_write(port, 0x303, 0x100, temp); 288 pm3386_port_reg_write(port, 0x303, 0x100, temp);
300
301 udelay(10);
302} 289}
303 290
304MODULE_LICENSE("GPL"); 291MODULE_LICENSE("GPL");