Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1a74b37 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

sky2: phy setup changes 



Change the setup of the PHY registers on some chip ids. These changes
make the latest sky2 driver follow the vendor driver.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 84aee488

drivers/net/sky2.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -658,8 +658,7 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port) 
		ledover |= PHY_M_LED_MO_RX(MO_LED_OFF);

		ledover |= PHY_M_LED_MO_RX(MO_LED_OFF);

	}

	}





	if (hw->chip_id == CHIP_ID_YUKON_EC_U &&

	if (hw->chip_id == CHIP_ID_YUKON_EC_U) {

	    hw->chip_rev == CHIP_REV_YU_EC_U_A1) {

		/* apply fixes in PHY AFE */

		/* apply fixes in PHY AFE */

		gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 255);

		gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 255);
@@ -678,7 +677,8 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port) 
		/* apply workaround for integrated resistors calibration */

		/* apply workaround for integrated resistors calibration */

		gm_phy_write(hw, port, PHY_MARV_PAGE_ADDR, 17);

		gm_phy_write(hw, port, PHY_MARV_PAGE_ADDR, 17);

		gm_phy_write(hw, port, PHY_MARV_PAGE_DATA, 0x3f60);

		gm_phy_write(hw, port, PHY_MARV_PAGE_DATA, 0x3f60);

	} else if (hw->chip_id != CHIP_ID_YUKON_EX) {

	} else if (hw->chip_id != CHIP_ID_YUKON_EX &&

		   hw->chip_id < CHIP_ID_YUKON_SUPR) {

		/* no effect on Yukon-XL */

		/* no effect on Yukon-XL */

		gm_phy_write(hw, port, PHY_MARV_LED_CTRL, ledctrl);

		gm_phy_write(hw, port, PHY_MARV_LED_CTRL, ledctrl);