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

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

[PATCH] sky2: phy power problems on 88e805X chips 

On the 88E805X chipsets (used in laptops), the PHY was not getting powered
out of shutdown properly. The variable reg1 was getting reused incorrectly.
This is probably the cause of the bug.
	http://bugzilla.kernel.org/show_bug.cgi?id=6471



Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 013b68bf

drivers/net/sky2.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -233,6 +233,8 @@ static void sky2_set_power_state(struct sky2_hw *hw, pci_power_t state) 
			if (hw->ports > 1)

			if (hw->ports > 1)

				reg1 |= PCI_Y2_PHY2_COMA;

				reg1 |= PCI_Y2_PHY2_COMA;

		}

		}

		sky2_pci_write32(hw, PCI_DEV_REG1, reg1);

		udelay(100);





		if (hw->chip_id == CHIP_ID_YUKON_EC_U) {

		if (hw->chip_id == CHIP_ID_YUKON_EC_U) {

			sky2_pci_write32(hw, PCI_DEV_REG3, 0);

			sky2_pci_write32(hw, PCI_DEV_REG3, 0);
@@ -242,9 +244,6 @@ static void sky2_set_power_state(struct sky2_hw *hw, pci_power_t state) 
			sky2_pci_write32(hw, PCI_DEV_REG5, 0);

			sky2_pci_write32(hw, PCI_DEV_REG5, 0);

		}

		}





		sky2_pci_write32(hw, PCI_DEV_REG1, reg1);

		udelay(100);



		break;

		break;





	case PCI_D3hot:

	case PCI_D3hot: