mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-15 15:15:47 +00:00
Code Issues Releases Wiki Activity

Revert "ravb: add workaround for clock when resuming with WoL enabled"

Browse source 
This reverts commit fbf3d034f2.

As of commit 560869100b ("clk: renesas: cpg-mssr: Restore module
clocks during resume"), the workaround is no longer needed.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Geert Uytterhoeven 2017-12-11 09:54:09 +01:00 committed by David S. Miller
parent 30791ac419
commit 6b782f43d3
1 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/net/ethernet/renesas/ravb_main.c
View file

@ -2308,32 +2308,9 @@ static int __maybe_unused ravb_resume(struct device *dev)
struct ravb_private *priv = netdev_priv(ndev);
int ret = 0;
if (priv->wol_enabled) {
/* Reduce the usecount of the clock to zero and then
* restore it to its original value. This is done to force
* the clock to be re-enabled which is a workaround
* for renesas-cpg-mssr driver which do not enable clocks
* when resuming from PSCI suspend/resume.
*
* Without this workaround the driver fails to communicate
* with the hardware if WoL was enabled when the system
* entered PSCI suspend. This is due to that if WoL is enabled
* we explicitly keep the clock from being turned off when
* suspending, but in PSCI sleep power is cut so the clock
* is disabled anyhow, the clock driver is not aware of this
* so the clock is not turned back on when resuming.
*
* TODO: once the renesas-cpg-mssr suspend/resume is working
* this clock dance should be removed.
*/
clk_disable(priv->clk);
clk_disable(priv->clk);
clk_enable(priv->clk);
clk_enable(priv->clk);
/* Set reset mode to rearm the WoL logic */
/* If WoL is enabled set reset mode to rearm the WoL logic */
if (priv->wol_enabled)
ravb_write(ndev, CCC_OPC_RESET, CCC);
}
/* All register have been reset to default values.
* Restore all registers which where setup at probe time and