diff options
| author | Jay Cliburn <jacliburn@bellsouth.net> | 2008-06-01 16:57:11 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-06-10 18:20:39 -0400 |
| commit | ae6b4d9ab6129467415801f30e487bc141a3f471 (patch) | |
| tree | 51901bb8b1f65543aefa1fd5651c575e3bc697b0 /drivers/net/atlx/atl1.c | |
| parent | d0ec0f549705b7ecfb787f02512606b08fe5b291 (diff) | |
| download | kernel_samsung_smdk4412-ae6b4d9ab6129467415801f30e487bc141a3f471.zip kernel_samsung_smdk4412-ae6b4d9ab6129467415801f30e487bc141a3f471.tar.gz kernel_samsung_smdk4412-ae6b4d9ab6129467415801f30e487bc141a3f471.tar.bz2 | |
atl1: fix suspend regression
Using vendor magic to force the PHY into power save mode breaks
suspend. It isn't needed anyway, so remove it.
Tested-by: Avuton Olrich <avuton@gmail.com>
Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/atlx/atl1.c')
| -rw-r--r-- | drivers/net/atlx/atl1.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index 6ddc911..99e0b4c 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c @@ -637,22 +637,6 @@ static s32 atl1_phy_leave_power_saving(struct atl1_hw *hw) } /* - * Force the PHY into power saving mode using vendor magic. - */ -#ifdef CONFIG_PM -static void atl1_phy_enter_power_saving(struct atl1_hw *hw) -{ - atl1_write_phy_reg(hw, MII_DBG_ADDR, 0); - atl1_write_phy_reg(hw, MII_DBG_DATA, 0x124E); - atl1_write_phy_reg(hw, MII_DBG_ADDR, 2); - atl1_write_phy_reg(hw, MII_DBG_DATA, 0x3000); - atl1_write_phy_reg(hw, MII_DBG_ADDR, 3); - atl1_write_phy_reg(hw, MII_DBG_DATA, 0); - -} -#endif - -/* * Resets the PHY and make all config validate * hw - Struct containing variables accessed by shared code * @@ -2860,7 +2844,6 @@ disable_wol: ctrl |= PCIE_PHYMISC_FORCE_RCV_DET; iowrite32(ctrl, hw->hw_addr + REG_PCIE_PHYMISC); ioread32(hw->hw_addr + REG_PCIE_PHYMISC); - atl1_phy_enter_power_saving(hw); hw->phy_configured = false; pci_enable_wake(pdev, pci_choose_state(pdev, state), 0); exit: |