commit ff35164e72648e0bf0b10ec4410c195e8607e88b
author Stephen Hemminger <shemminger@linux-foundation.org> Thu Oct 11 19:47:44 2007 -0700
committer David S. Miller <davem@sunset.davemloft.net> Thu Oct 11 22:17:18 2007 -0700
tree fba0df4a245483706d413e9953807c5aa37e314c
parent 295b54c4902c52cd00d7c837d50a86e39e26caec

[SKY2]: fix power settings on Yukon XL

Make sure PCI register for PHY power gets set correctly.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

drivers/net/sky2.c

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 4832f64..c9ee8a2 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -606,20 +606,19 @@
 {
 	struct pci_dev *pdev = hw->pdev;
 	u32 reg1;
-	static const u32 phy_power[]
-		= { PCI_Y2_PHY1_POWD, PCI_Y2_PHY2_POWD };
-
-	/* looks like this XL is back asswards .. */
-	if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)
-		onoff = !onoff;
+	static const u32 phy_power[] = { PCI_Y2_PHY1_POWD, PCI_Y2_PHY2_POWD };
+	static const u32 coma_mode[] = { PCI_Y2_PHY1_COMA, PCI_Y2_PHY2_COMA };
 
 	pci_read_config_dword(pdev, PCI_DEV_REG1, &reg1);
+	/* Turn on/off phy power saving */
 	if (onoff)
-		/* Turn off phy power saving */
 		reg1 &= ~phy_power[port];
 	else
 		reg1 |= phy_power[port];
 
+	if (onoff && hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)
+		reg1 |= coma_mode[port];
+
 	pci_write_config_dword(pdev, PCI_DEV_REG1, reg1);
 	pci_read_config_dword(pdev, PCI_DEV_REG1, &reg1);