aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sky2.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/sky2.c')
-rw-r--r--drivers/net/sky2.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 7f1cfc48e1b2..af7ea887118a 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -658,8 +658,7 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
658 ledover |= PHY_M_LED_MO_RX(MO_LED_OFF); 658 ledover |= PHY_M_LED_MO_RX(MO_LED_OFF);
659 } 659 }
660 660
661 if (hw->chip_id == CHIP_ID_YUKON_EC_U && 661 if (hw->chip_id == CHIP_ID_YUKON_EC_U) {
662 hw->chip_rev == CHIP_REV_YU_EC_U_A1) {
663 /* apply fixes in PHY AFE */ 662 /* apply fixes in PHY AFE */
664 gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 255); 663 gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 255);
665 664
@@ -678,7 +677,8 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
678 /* apply workaround for integrated resistors calibration */ 677 /* apply workaround for integrated resistors calibration */
679 gm_phy_write(hw, port, PHY_MARV_PAGE_ADDR, 17); 678 gm_phy_write(hw, port, PHY_MARV_PAGE_ADDR, 17);
680 gm_phy_write(hw, port, PHY_MARV_PAGE_DATA, 0x3f60); 679 gm_phy_write(hw, port, PHY_MARV_PAGE_DATA, 0x3f60);
681 } else if (hw->chip_id != CHIP_ID_YUKON_EX) { 680 } else if (hw->chip_id != CHIP_ID_YUKON_EX &&
681 hw->chip_id < CHIP_ID_YUKON_SUPR) {
682 /* no effect on Yukon-XL */ 682 /* no effect on Yukon-XL */
683 gm_phy_write(hw, port, PHY_MARV_LED_CTRL, ledctrl); 683 gm_phy_write(hw, port, PHY_MARV_LED_CTRL, ledctrl);
684 684