Skip to content

Commit

Permalink
sky2: enable clocks before probe
Browse files Browse the repository at this point in the history
Catch-22: On Yukon EX (88E8071) need to have internal clocks enabled
before reading chip id. It is harmless on other chips.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Stephen Hemminger authored and Jeff Garzik committed Jul 9, 2007
1 parent f449c7c commit 451af33
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/net/sky2.c
Original file line number Diff line number Diff line change
Expand Up @@ -2519,6 +2519,9 @@ static int __devinit sky2_init(struct sky2_hw *hw)
{
u8 t8;

/* Enable all clocks */
sky2_pci_write32(hw, PCI_DEV_REG3, 0);

sky2_write8(hw, B0_CTST, CS_RST_CLR);

hw->chip_id = sky2_read8(hw, B2_CHIP_ID);
Expand All @@ -2532,10 +2535,6 @@ static int __devinit sky2_init(struct sky2_hw *hw)
dev_warn(&hw->pdev->dev, "this driver not yet tested on this chip type\n"
"Please report success or failure to <netdev@vger.kernel.org>\n");

/* Make sure and enable all clocks */
if (hw->chip_id == CHIP_ID_YUKON_EX || hw->chip_id == CHIP_ID_YUKON_EC_U)
sky2_pci_write32(hw, PCI_DEV_REG3, 0);

hw->chip_rev = (sky2_read8(hw, B2_MAC_CFG) & CFG_CHIP_R_MSK) >> 4;

/* This rev is really old, and requires untested workarounds */
Expand Down

0 comments on commit 451af33

Please sign in to comment.