Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Allen-KH Cheng and committed by
Mark Brown
317c2045 2c7d1b28

+11 -1
+11 -1
drivers/spi/spi-mtk-nor.c
··· 960 960 961 961 static int __maybe_unused mtk_nor_resume(struct device *dev) 962 962 { 963 - return pm_runtime_force_resume(dev); 963 + struct spi_controller *ctlr = dev_get_drvdata(dev); 964 + struct mtk_nor *sp = spi_controller_get_devdata(ctlr); 965 + int ret; 966 + 967 + ret = pm_runtime_force_resume(dev); 968 + if (ret) 969 + return ret; 970 + 971 + mtk_nor_init(sp); 972 + 973 + return 0; 964 974 } 965 975 966 976 static const struct dev_pm_ops mtk_nor_pm_ops = {