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

Commit 836384d2 authored by Wenyou Yang's avatar Wenyou Yang Committed by David S. Miller
Browse files

net: phy: micrel: Add specific suspend 



Disable all interrupts when suspend, they will be enabled
when resume. Otherwise, the suspend/resume process will be
blocked occasionally.

Signed-off-by: default avatarWenyou Yang <wenyou.yang@atmel.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a96d3b75

drivers/net/phy/micrel.c

+19 −8
Original line number Original line Diff line number Diff line
@@ -677,17 +677,28 @@ static void kszphy_get_stats(struct phy_device *phydev, 
		data[i] = kszphy_get_stat(phydev, i);

		data[i] = kszphy_get_stat(phydev, i);

}

}





static int kszphy_resume(struct phy_device *phydev)

static int kszphy_suspend(struct phy_device *phydev)

{

{

	int value;

	/* Disable PHY Interrupts */

	if (phy_interrupt_is_valid(phydev)) {

		phydev->interrupts = PHY_INTERRUPT_DISABLED;

		if (phydev->drv->config_intr)

			phydev->drv->config_intr(phydev);

	}





	mutex_lock(&phydev->lock);

	return genphy_suspend(phydev);

}





	value = phy_read(phydev, MII_BMCR);

static int kszphy_resume(struct phy_device *phydev)

	phy_write(phydev, MII_BMCR, value & ~BMCR_PDOWN);

{

	genphy_resume(phydev);





	kszphy_config_intr(phydev);

	/* Enable PHY Interrupts */

	mutex_unlock(&phydev->lock);

	if (phy_interrupt_is_valid(phydev)) {

		phydev->interrupts = PHY_INTERRUPT_ENABLED;

		if (phydev->drv->config_intr)

			phydev->drv->config_intr(phydev);

	}





	return 0;

	return 0;

}

}
@@ -900,7 +911,7 @@ static struct phy_driver ksphy_driver[] = { 
	.get_sset_count = kszphy_get_sset_count,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.suspend	= kszphy_suspend,

	.resume		= kszphy_resume,

	.resume		= kszphy_resume,

}, {

}, {

	.phy_id		= PHY_ID_KSZ8061,

	.phy_id		= PHY_ID_KSZ8061,