From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Wed, 16 Aug 2006 20:39:04 +0000 (-0700)
Subject: e1000: Disable aggressive clocking on esb2 with SERDES port
X-Git-Tag: v2.6.19-rc1~1263^2~80^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=600c977c0801210602d7502f9c978c2b8c31a209;p=linux-2.6-omap-h63xx.git

e1000: Disable aggressive clocking on esb2 with SERDES port

Disable aggressive clocking on esb2 with SERDES port as it causes
hardware problems.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index b2caaa2117f..978e3b72202 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -1498,8 +1498,6 @@ e1000_configure_tx(struct e1000_adapter *adapter)
 	} else if (hw->mac_type == e1000_80003es2lan) {
 		tarc = E1000_READ_REG(hw, TARC0);
 		tarc |= 1;
-		if (hw->media_type == e1000_media_type_internal_serdes)
-			tarc |= (1 << 20);
 		E1000_WRITE_REG(hw, TARC0, tarc);
 		tarc = E1000_READ_REG(hw, TARC1);
 		tarc |= 1;