Commit 6b782f43 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by David S. Miller

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

This reverts commit fbf3d034.

As of commit 56086910 ("clk: renesas: cpg-mssr: Restore module
clocks during resume"), the workaround is no longer needed.
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Acked-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 30791ac4
...@@ -2308,32 +2308,9 @@ static int __maybe_unused ravb_resume(struct device *dev) ...@@ -2308,32 +2308,9 @@ static int __maybe_unused ravb_resume(struct device *dev)
struct ravb_private *priv = netdev_priv(ndev); struct ravb_private *priv = netdev_priv(ndev);
int ret = 0; int ret = 0;
if (priv->wol_enabled) { /* If WoL is enabled set reset mode to rearm the WoL logic */
/* Reduce the usecount of the clock to zero and then if (priv->wol_enabled)
* 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 */
ravb_write(ndev, CCC_OPC_RESET, CCC); ravb_write(ndev, CCC_OPC_RESET, CCC);
}
/* All register have been reset to default values. /* All register have been reset to default values.
* Restore all registers which where setup at probe time and * Restore all registers which where setup at probe time and
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment