forked from luck/tmp_suning_uos_patched
spi: spi-s3c64xx: Fix system resume support
Since Linux v4.10 release (commit 1d9174fbc5
"PM / Runtime: Defer
resuming of the device in pm_runtime_force_resume()"),
pm_runtime_force_resume() function doesn't runtime resume device if it was
not runtime active before system suspend. Thus, driver should not do any
register access after pm_runtime_force_resume() without checking the
runtime status of the device. To fix this issue, simply move
s3c64xx_spi_hwinit() call to s3c64xx_spi_runtime_resume() to ensure that
hardware is always properly initialized. This fixes Synchronous external
abort issue on system suspend/resume cycle on newer Exynos SoCs.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
This commit is contained in:
parent
b645605703
commit
e935dba111
|
@ -1292,8 +1292,6 @@ static int s3c64xx_spi_resume(struct device *dev)
|
|||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
s3c64xx_spi_hwinit(sdd);
|
||||
|
||||
return spi_master_resume(master);
|
||||
}
|
||||
#endif /* CONFIG_PM_SLEEP */
|
||||
|
@ -1331,6 +1329,8 @@ static int s3c64xx_spi_runtime_resume(struct device *dev)
|
|||
if (ret != 0)
|
||||
goto err_disable_src_clk;
|
||||
|
||||
s3c64xx_spi_hwinit(sdd);
|
||||
|
||||
return 0;
|
||||
|
||||
err_disable_src_clk:
|
||||
|
|
Loading…
Reference in New Issue
Block a user