| From f25a5d84c0794be3d1c1b0fa43d7df1c68a98745 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 12 Apr 2022 19:57:43 +0800 |
| Subject: spi: spi-mtk-nor: initialize spi controller after resume |
| |
| From: Allen-KH Cheng <allen-kh.cheng@mediatek.com> |
| |
| [ Upstream commit 317c2045618cc1f8d38beb8c93a7bdb6ad8638c6 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/spi/spi-mtk-nor.c | 12 +++++++++++- |
| 1 file changed, 11 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/spi/spi-mtk-nor.c b/drivers/spi/spi-mtk-nor.c |
| index 288f6c2bbd57..106e3cacba4c 100644 |
| --- a/drivers/spi/spi-mtk-nor.c |
| +++ b/drivers/spi/spi-mtk-nor.c |
| @@ -895,7 +895,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 = { |
| -- |
| 2.35.1 |
| |