Skip to content

Commit

Permalink
sky2: dont set bogus bit in PHY register
Browse files Browse the repository at this point in the history
This code inherited from the sk98lin driver is incorrect on the Yukon2.
The GPHY_CTRL register values are specific to the internal PHY of the chip
and the values used were leftovers.
Driver was setting bit 13 which is now the INT polarity for the PHY!

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 May 30, 2007
1 parent 8903bab commit b4ed372
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 23 deletions.
2 changes: 1 addition & 1 deletion drivers/net/sky2.c
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
const u8 *addr = hw->dev[port]->dev_addr;

sky2_write32(hw, SK_REG(port, GPHY_CTRL), GPC_RST_SET);
sky2_write32(hw, SK_REG(port, GPHY_CTRL), GPC_RST_CLR|GPC_ENA_PAUSE);
sky2_write32(hw, SK_REG(port, GPHY_CTRL), GPC_RST_CLR);

sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_RST_CLR);

Expand Down
22 changes: 0 additions & 22 deletions drivers/net/sky2.h
Original file line number Diff line number Diff line change
Expand Up @@ -1732,28 +1732,6 @@ enum {

/* GPHY_CTRL 32 bit GPHY Control Reg (YUKON only) */
enum {
GPC_SEL_BDT = 1<<28, /* Select Bi-Dir. Transfer for MDC/MDIO */
GPC_INT_POL_HI = 1<<27, /* IRQ Polarity is Active HIGH */
GPC_75_OHM = 1<<26, /* Use 75 Ohm Termination instead of 50 */
GPC_DIS_FC = 1<<25, /* Disable Automatic Fiber/Copper Detection */
GPC_DIS_SLEEP = 1<<24, /* Disable Energy Detect */
GPC_HWCFG_M_3 = 1<<23, /* HWCFG_MODE[3] */
GPC_HWCFG_M_2 = 1<<22, /* HWCFG_MODE[2] */
GPC_HWCFG_M_1 = 1<<21, /* HWCFG_MODE[1] */
GPC_HWCFG_M_0 = 1<<20, /* HWCFG_MODE[0] */
GPC_ANEG_0 = 1<<19, /* ANEG[0] */
GPC_ENA_XC = 1<<18, /* Enable MDI crossover */
GPC_DIS_125 = 1<<17, /* Disable 125 MHz clock */
GPC_ANEG_3 = 1<<16, /* ANEG[3] */
GPC_ANEG_2 = 1<<15, /* ANEG[2] */
GPC_ANEG_1 = 1<<14, /* ANEG[1] */
GPC_ENA_PAUSE = 1<<13, /* Enable Pause (SYM_OR_REM) */
GPC_PHYADDR_4 = 1<<12, /* Bit 4 of Phy Addr */
GPC_PHYADDR_3 = 1<<11, /* Bit 3 of Phy Addr */
GPC_PHYADDR_2 = 1<<10, /* Bit 2 of Phy Addr */
GPC_PHYADDR_1 = 1<<9, /* Bit 1 of Phy Addr */
GPC_PHYADDR_0 = 1<<8, /* Bit 0 of Phy Addr */
/* Bits 7..2: reserved */
GPC_RST_CLR = 1<<1, /* Clear GPHY Reset */
GPC_RST_SET = 1<<0, /* Set GPHY Reset */
};
Expand Down

0 comments on commit b4ed372

Please sign in to comment.