summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/freescale/fman/src
diff options
context:
space:
mode:
authorEyal Harari <Eyal.Harari@freesacle.com>2014-08-28 09:59:36 (GMT)
committerRich Schmitt <B43082@freescale.com>2014-09-05 17:24:29 (GMT)
commit455191e68d54c189ee6ec0821ff9b44f8ee0500d (patch)
tree9d2738d764cff148c88c43838d45323991b7c119 /drivers/net/ethernet/freescale/fman/src
parent637216ff999062a5ae21a2d1683b1e82d189e697 (diff)
downloadlinux-fsl-qoriq-455191e68d54c189ee6ec0821ff9b44f8ee0500d.tar.xz
FMD: DSAR: call device_set_wakeup_enable only for AR. Do it in .suspend and .resume
Signed-off-by: Eyal Harari <Eyal.Harari@freesacle.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/fman/src')
-rwxr-xr-xdrivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c b/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c
index b3604d7..1c398cf 100755
--- a/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c
+++ b/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c
@@ -1075,7 +1075,6 @@ static int /*__devinit*/ fm_probe(struct platform_device *of_dev)
#ifdef CONFIG_PM
device_set_wakeup_capable(p_LnxWrpFmDev->dev, true);
- device_set_wakeup_enable(p_LnxWrpFmDev->dev, 1);
#endif
DBG(TRACE, ("FM%d probed", p_LnxWrpFmDev->id));
@@ -1139,6 +1138,7 @@ static int fm_soc_suspend(struct device *dev)
if (p_LnxWrpFmDev->h_DsarRxPort)
{
#ifdef CONFIG_FSL_QORIQ_PM
+ device_set_wakeup_enable(p_LnxWrpFmDev->dev, 1);
fsl_set_power_except(dev,1);
#endif
err = FM_PORT_EnterDsarFinal(p_LnxWrpFmDev->h_DsarRxPort,
@@ -1155,6 +1155,10 @@ static int fm_soc_resume(struct device *dev)
WRITE_UINT32(*fmclk, SCFG_FMCLKDPSLPCR_NORMAL_VAL);
if (p_LnxWrpFmDev->h_DsarRxPort)
{
+#ifdef CONFIG_FSL_QORIQ_PM
+ fsl_set_power_except(dev,0);
+ device_set_wakeup_enable(p_LnxWrpFmDev->dev, 0);
+#endif
p_LnxWrpFmDev->h_DsarRxPort = 0;
p_LnxWrpFmDev->h_DsarTxPort = 0;
}