Commit 136b5cd2 authored by Yuji Sasaki's avatar Yuji Sasaki Committed by Mark Brown

spi: qup: call spi_qup_pm_resume_runtime before suspending

spi_qup_suspend() will cause synchronous external abort when
runtime suspend is enabled and applied, as it tries to
access SPI controller register while clock is already disabled
in spi_qup_pm_suspend_runtime().
Signed-off-by: default avatarYuji sasaki <sasakiy@chromium.org>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Link: https://lore.kernel.org/r/20200214074340.2286170-1-vkoul@kernel.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 32f2fc5d
...@@ -1217,6 +1217,11 @@ static int spi_qup_suspend(struct device *device) ...@@ -1217,6 +1217,11 @@ static int spi_qup_suspend(struct device *device)
struct spi_qup *controller = spi_master_get_devdata(master); struct spi_qup *controller = spi_master_get_devdata(master);
int ret; int ret;
if (pm_runtime_suspended(device)) {
ret = spi_qup_pm_resume_runtime(device);
if (ret)
return ret;
}
ret = spi_master_suspend(master); ret = spi_master_suspend(master);
if (ret) if (ret)
return ret; return ret;
...@@ -1225,10 +1230,8 @@ static int spi_qup_suspend(struct device *device) ...@@ -1225,10 +1230,8 @@ static int spi_qup_suspend(struct device *device)
if (ret) if (ret)
return ret; return ret;
if (!pm_runtime_suspended(device)) { clk_disable_unprepare(controller->cclk);
clk_disable_unprepare(controller->cclk); clk_disable_unprepare(controller->iclk);
clk_disable_unprepare(controller->iclk);
}
return 0; return 0;
} }
......
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