]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
e1000: Disable aggressive clocking on esb2 with SERDES port
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 16 Aug 2006 20:39:04 +0000 (13:39 -0700)
committerAuke Kok <juke-jan.h.kok@intel.com>
Wed, 16 Aug 2006 20:39:04 +0000 (13:39 -0700)
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>
drivers/net/e1000/e1000_main.c

index b2caaa2117f232455af7dfd1c783ffced5e66942..978e3b722022e5d5bf50e4e30538fc372d28b0d5 100644 (file)
@@ -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;