hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'spi/topic/s3c64xx' into spi-next

This commit is contained in:
Mark Brown 2013-10-25 09:51:38 +01:00
parent d448121c4c 9d7fd21acb
commit 84b6146564
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/spi/spi-s3c64xx.c
View File

@ -1459,11 +1459,14 @@ static int s3c64xx_spi_suspend(struct device *dev)
struct spi_master *master = dev_get_drvdata(dev); struct spi_master *master = dev_get_drvdata(dev);
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
spi_master_suspend(master); int ret = spi_master_suspend(master);
if (ret)
return ret;
/* Disable the clock */ if (!pm_runtime_suspended(dev)) {
clk_disable_unprepare(sdd->src_clk);
clk_disable_unprepare(sdd->clk); clk_disable_unprepare(sdd->clk);
clk_disable_unprepare(sdd->src_clk);
}
sdd->cur_speed = 0; /* Output Clock is stopped */ sdd->cur_speed = 0; /* Output Clock is stopped */
@ -1479,15 +1482,14 @@ static int s3c64xx_spi_resume(struct device *dev)
if (sci->cfg_gpio) if (sci->cfg_gpio)
sci->cfg_gpio(); sci->cfg_gpio();
/* Enable the clock */ if (!pm_runtime_suspended(dev)) {
clk_prepare_enable(sdd->src_clk); clk_prepare_enable(sdd->src_clk);
clk_prepare_enable(sdd->clk); clk_prepare_enable(sdd->clk);
}
s3c64xx_spi_hwinit(sdd, sdd->port_id); s3c64xx_spi_hwinit(sdd, sdd->port_id);
spi_master_resume(master); return spi_master_resume(master);
return 0;
} }
#endif /* CONFIG_PM_SLEEP */ #endif /* CONFIG_PM_SLEEP */