Commit 2240eb4a authored by Lino Sanfilippo's avatar Lino Sanfilippo Committed by David S. Miller

sky2: dont overwrite settings for PHY Quick link

This patch corrects a bug in function sky2_open() of the Marvell Yukon 2 driver
in which the settings for PHY quick link are overwritten.
Signed-off-by: default avatarLino Sanfilippo <LinoSanfilippo@gmx.de>
Acked-by: default avatarStephen Hemminger <shemminger@vyattta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 085f1afc
...@@ -1767,13 +1767,14 @@ static int sky2_open(struct net_device *dev) ...@@ -1767,13 +1767,14 @@ static int sky2_open(struct net_device *dev)
sky2_hw_up(sky2); sky2_hw_up(sky2);
/* Enable interrupts from phy/mac for port */
imask = sky2_read32(hw, B0_IMSK);
if (hw->chip_id == CHIP_ID_YUKON_OPT || if (hw->chip_id == CHIP_ID_YUKON_OPT ||
hw->chip_id == CHIP_ID_YUKON_PRM || hw->chip_id == CHIP_ID_YUKON_PRM ||
hw->chip_id == CHIP_ID_YUKON_OP_2) hw->chip_id == CHIP_ID_YUKON_OP_2)
imask |= Y2_IS_PHY_QLNK; /* enable PHY Quick Link */ imask |= Y2_IS_PHY_QLNK; /* enable PHY Quick Link */
/* Enable interrupts from phy/mac for port */
imask = sky2_read32(hw, B0_IMSK);
imask |= portirq_msk[port]; imask |= portirq_msk[port];
sky2_write32(hw, B0_IMSK, imask); sky2_write32(hw, B0_IMSK, imask);
sky2_read32(hw, B0_IMSK); sky2_read32(hw, B0_IMSK);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment