Skip to content

Commit

Permalink
spi: spi-mtk-nor: initialize spi controller after resume
Browse files Browse the repository at this point in the history
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: 3bfd910 ("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>
  • Loading branch information
Allen-KH Cheng authored and Mark Brown committed Apr 12, 2022
1 parent 2c7d1b2 commit 317c204
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion drivers/spi/spi-mtk-nor.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down

0 comments on commit 317c204

Please sign in to comment.