|
@@ -1246,10 +1246,9 @@ static int s3c64xx_spi_suspend(struct device *dev)
|
|
|
if (ret)
|
|
|
return ret;
|
|
|
|
|
|
- if (!pm_runtime_suspended(dev)) {
|
|
|
- clk_disable_unprepare(sdd->clk);
|
|
|
- clk_disable_unprepare(sdd->src_clk);
|
|
|
- }
|
|
|
+ ret = pm_runtime_force_suspend(dev);
|
|
|
+ if (ret < 0)
|
|
|
+ return ret;
|
|
|
|
|
|
sdd->cur_speed = 0; /* Output Clock is stopped */
|
|
|
|
|
@@ -1261,14 +1260,14 @@ static int s3c64xx_spi_resume(struct device *dev)
|
|
|
struct spi_master *master = dev_get_drvdata(dev);
|
|
|
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
|
|
|
struct s3c64xx_spi_info *sci = sdd->cntrlr_info;
|
|
|
+ int ret;
|
|
|
|
|
|
if (sci->cfg_gpio)
|
|
|
sci->cfg_gpio();
|
|
|
|
|
|
- if (!pm_runtime_suspended(dev)) {
|
|
|
- clk_prepare_enable(sdd->src_clk);
|
|
|
- clk_prepare_enable(sdd->clk);
|
|
|
- }
|
|
|
+ ret = pm_runtime_force_resume(dev);
|
|
|
+ if (ret < 0)
|
|
|
+ return ret;
|
|
|
|
|
|
s3c64xx_spi_hwinit(sdd, sdd->port_id);
|
|
|
|