diff options
| author | Allen-KH Cheng <allen-kh.cheng@mediatek.com> | 2022-04-12 13:57:43 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-04-12 18:18:51 +0200 |
| commit | 317c2045618cc1f8d38beb8c93a7bdb6ad8638c6 (patch) | |
| tree | 690adad1bd87dccc5d6ce03d7f0f0fc2001a7e28 /drivers/spi/spi-mtk-nor.c | |
| parent | spi: bcm-qspi: fix MSPI only access with bcm_qspi_exec_mem_op() (diff) | |
| download | linux-317c2045618cc1f8d38beb8c93a7bdb6ad8638c6.tar.xz linux-317c2045618cc1f8d38beb8c93a7bdb6ad8638c6.zip | |
spi: spi-mtk-nor: initialize spi controller after resume
After system resumes, the registers of nor controller are
initialized with default values. The nor controller will
not function properly.
To handle both issues above, we add mtk_nor_init() in
mtk_nor_resume after pm_runtime_force_resume().
Fixes: 3bfd9103c7af ("spi: spi-mtk-nor: Add power management support")
Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com>
Reviewed-by: Rex-BC Chen <rex-bc.chen@mediatek.com>
Link: https://lore.kernel.org/r/20220412115743.22641-1-allen-kh.cheng@mediatek.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-mtk-nor.c')
| -rw-r--r-- | drivers/spi/spi-mtk-nor.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/spi/spi-mtk-nor.c b/drivers/spi/spi-mtk-nor.c index 94fb09696677..d167699a1a96 100644 --- a/drivers/spi/spi-mtk-nor.c +++ b/drivers/spi/spi-mtk-nor.c @@ -960,7 +960,17 @@ static int __maybe_unused mtk_nor_suspend(struct device *dev) static int __maybe_unused mtk_nor_resume(struct device *dev) { - return pm_runtime_force_resume(dev); + struct spi_controller *ctlr = dev_get_drvdata(dev); + struct mtk_nor *sp = spi_controller_get_devdata(ctlr); + int ret; + + ret = pm_runtime_force_resume(dev); + if (ret) + return ret; + + mtk_nor_init(sp); + + return 0; } static const struct dev_pm_ops mtk_nor_pm_ops = { |