diff options
| author | Lino Sanfilippo <LinoSanfilippo@gmx.de> | 2012-03-30 07:28:59 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-02 18:41:06 -0400 |
| commit | 2240eb4ae3dc4acff20d1a8947c441c451513e37 (patch) | |
| tree | 18e2923bb441df812bcdae8a928076e22eaf2e9a /drivers | |
| parent | 085f1afc56619bda424941412fdeaff1e32c21dc (diff) | |
| download | op-kernel-dev-2240eb4ae3dc4acff20d1a8947c441c451513e37.zip op-kernel-dev-2240eb4ae3dc4acff20d1a8947c441c451513e37.tar.gz | |
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: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Acked-by: Stephen Hemminger <shemminger@vyattta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/marvell/sky2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index 423a1a2..b806d9b 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -1767,13 +1767,14 @@ static int sky2_open(struct net_device *dev) 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 || hw->chip_id == CHIP_ID_YUKON_PRM || hw->chip_id == CHIP_ID_YUKON_OP_2) 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]; sky2_write32(hw, B0_IMSK, imask); sky2_read32(hw, B0_IMSK); |
