From 7ae4bd3a51b71fef32dbd55a51ec76d2d313394d Mon Sep 17 00:00:00 2001
From: Henry Nestler <henry.nestler@gmail.com>
Date: Tue, 22 Feb 2011 11:29:42 +0000
Subject: [PATCH] --- yaml --- r: 233627 b: refs/heads/master c:
 108f518cc4f81eb8e3b46a0bd5cb902ef90a51a8 h: refs/heads/master i:   233625:
 62d453b27fb308ae7e766e98cf5695210cda9a8e   233623:
 387a15dd8d01b530483f46c51daee9e3455ce633 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/net/dm9000.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 015ede6a3c62..5eafd681b47e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8dde924217fdf5b69f6cbbdca099d077ba269ad0
+refs/heads/master: 108f518cc4f81eb8e3b46a0bd5cb902ef90a51a8
diff --git a/trunk/drivers/net/dm9000.c b/trunk/drivers/net/dm9000.c
index 2bbd49653aa2..461dd6f905f7 100644
--- a/trunk/drivers/net/dm9000.c
+++ b/trunk/drivers/net/dm9000.c
@@ -802,10 +802,7 @@ dm9000_init_dm9000(struct net_device *dev)
 	/* Checksum mode */
 	dm9000_set_rx_csum_unlocked(dev, db->rx_csum);
 
-	/* GPIO0 on pre-activate PHY */
-	iow(db, DM9000_GPR, 0);	/* REG_1F bit0 activate phyxcer */
 	iow(db, DM9000_GPCR, GPCR_GEP_CNTL);	/* Let GPIO0 output */
-	iow(db, DM9000_GPR, 0);	/* Enable PHY */
 
 	ncr = (db->flags & DM9000_PLATF_EXT_PHY) ? NCR_EXT_PHY : 0;
 
@@ -1194,6 +1191,10 @@ dm9000_open(struct net_device *dev)
 	if (request_irq(dev->irq, dm9000_interrupt, irqflags, dev->name, dev))
 		return -EAGAIN;
 
+	/* GPIO0 on pre-activate PHY, Reg 1F is not set by reset */
+	iow(db, DM9000_GPR, 0);	/* REG_1F bit0 activate phyxcer */
+	mdelay(1); /* delay needs by DM9000B */
+
 	/* Initialize DM9000 board */
 	dm9000_reset(db);
 	dm9000_init_dm9000(dev);