Commit 4b7c47aa authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

sky2: add XL revisions 



Add definitions for Yukon XL revisions.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c1cd0a85

drivers/net/sky2.c

+6 −4
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static void sky2_power_on(struct sky2_hw *hw) 
	/* disable Core Clock Division, */

	sky2_write32(hw, B2_Y2_CLK_CTRL, Y2_CLK_DIV_DIS);



	if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)

	if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > CHIP_REV_YU_XL_A1)

		/* enable bits are inverted */

		sky2_write8(hw, B2_Y2_CLK_GATE,

			    Y2_PCI_CLK_LNK1_DIS | Y2_COR_CLK_LNK1_DIS |
@@ -268,7 +268,7 @@ static void sky2_power_on(struct sky2_hw *hw) 


static void sky2_power_aux(struct sky2_hw *hw)

{

	if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)

	if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > CHIP_REV_YU_XL_A1)

		sky2_write8(hw, B2_Y2_CLK_GATE, 0);

	else

		/* enable bits are inverted */
@@ -651,7 +651,7 @@ static void sky2_phy_power_up(struct sky2_hw *hw, unsigned port) 
	reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);

	reg1 &= ~phy_power[port];



	if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)

	if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > CHIP_REV_YU_XL_A1)

		reg1 |= coma_mode[port];



	sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
@@ -823,7 +823,9 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port) 


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



	if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev == 0 && port == 1) {

	if (hw->chip_id == CHIP_ID_YUKON_XL &&

	    hw->chip_rev == CHIP_REV_YU_XL_A0 &&

	    port == 1) {

		/* WA DEV_472 -- looks like crossed wires on port 2 */

		/* clear GMAC 1 Control reset */

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

drivers/net/sky2.h

+8 −0
Original line number Diff line number Diff line
@@ -548,6 +548,14 @@ enum { 
	CHIP_ID_YUKON_UL_2 = 0xba, /* YUKON-2 Ultra 2 */

	CHIP_ID_YUKON_OPT  = 0xbc, /* YUKON-2 Optima */

};



enum yukon_xl_rev {

	CHIP_REV_YU_XL_A0  = 0,

	CHIP_REV_YU_XL_A1  = 1,

	CHIP_REV_YU_XL_A2  = 2,

	CHIP_REV_YU_XL_A3  = 3,

};



enum yukon_ec_rev {

	CHIP_REV_YU_EC_A1    = 0,  /* Chip Rev. for Yukon-EC A1/A0 */

	CHIP_REV_YU_EC_A2    = 1,  /* Chip Rev. for Yukon-EC A2 */