summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/freescale/fman/src
diff options
context:
space:
mode:
authorEyal Harari <Eyal.Harari@freesacle.com>2014-08-26 09:40:19 (GMT)
committerRich Schmitt <B43082@freescale.com>2014-09-05 17:15:47 (GMT)
commitd677f2bd4a04a19e245faa23b56253849ca25605 (patch)
tree7ac0e936d425e9f3fdd1449c34ff7aebfd3ec03f /drivers/net/ethernet/freescale/fman/src
parent10cecebd6e5a9daf9bcb6ede01184237c7df8d79 (diff)
downloadlinux-fsl-qoriq-d677f2bd4a04a19e245faa23b56253849ca25605.tar.xz
FMD: DS: configure SCFG_FMCLKDPSLPCR for all DS cases, not only AR
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.c12
1 files changed, 6 insertions, 6 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 e70c929..b3604d7 100755
--- a/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c
+++ b/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c
@@ -1131,18 +1131,18 @@ struct device *g_fm_dev;
static int fm_soc_suspend(struct device *dev)
{
int err = 0;
+ uint32_t *fmclk;
t_LnxWrpFmDev *p_LnxWrpFmDev = dev_get_drvdata(get_device(dev));
g_fm_dev = dev;
+ fmclk = ioremap(SCFG_FMCLKDPSLPCR_ADDR, 4);
+ WRITE_UINT32(*fmclk, SCFG_FMCLKDPSLPCR_DS_VAL);
if (p_LnxWrpFmDev->h_DsarRxPort)
{
- uint32_t *fmclk;
#ifdef CONFIG_FSL_QORIQ_PM
fsl_set_power_except(dev,1);
#endif
err = FM_PORT_EnterDsarFinal(p_LnxWrpFmDev->h_DsarRxPort,
p_LnxWrpFmDev->h_DsarTxPort);
- fmclk = ioremap(SCFG_FMCLKDPSLPCR_ADDR, 4);
- WRITE_UINT32(*fmclk, SCFG_FMCLKDPSLPCR_DS_VAL);
}
return err;
}
@@ -1150,11 +1150,11 @@ static int fm_soc_suspend(struct device *dev)
static int fm_soc_resume(struct device *dev)
{
t_LnxWrpFmDev *p_LnxWrpFmDev = dev_get_drvdata(get_device(dev));
+ uint32_t *fmclk;
+ fmclk = ioremap(SCFG_FMCLKDPSLPCR_ADDR, 4);
+ WRITE_UINT32(*fmclk, SCFG_FMCLKDPSLPCR_NORMAL_VAL);
if (p_LnxWrpFmDev->h_DsarRxPort)
{
- uint32_t *fmclk;
- fmclk = ioremap(SCFG_FMCLKDPSLPCR_ADDR, 4);
- WRITE_UINT32(*fmclk, SCFG_FMCLKDPSLPCR_NORMAL_VAL);
p_LnxWrpFmDev->h_DsarRxPort = 0;
p_LnxWrpFmDev->h_DsarTxPort = 0;
}