[PATCH v2 4/5] spi: stm32: fixes suspend/resume management

From: Alain Volmat
Date: Mon Aug 10 2020 - 03:13:17 EST


From: Amelie Delaunay <amelie.delaunay@xxxxxx>

This patch adds pinctrl power management, and reconfigure spi controller
in case of resume.

Fixes: 038ac869c9d2 ("spi: stm32: add runtime PM support")

Signed-off-by: Amelie Delaunay <amelie.delaunay@xxxxxx>
Signed-off-by: Alain Volmat <alain.volmat@xxxxxx>
---
v2: identical to v1

drivers/spi/spi-stm32.c | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/drivers/spi/spi-stm32.c b/drivers/spi/spi-stm32.c
index 571dea72bf7e..9b90a22543fd 100644
--- a/drivers/spi/spi-stm32.c
+++ b/drivers/spi/spi-stm32.c
@@ -13,6 +13,7 @@
#include <linux/iopoll.h>
#include <linux/module.h>
#include <linux/of_platform.h>
+#include <linux/pinctrl/consumer.h>
#include <linux/pm_runtime.h>
#include <linux/reset.h>
#include <linux/spi/spi.h>
@@ -2007,6 +2008,8 @@ static int stm32_spi_remove(struct platform_device *pdev)

pm_runtime_disable(&pdev->dev);

+ pinctrl_pm_select_sleep_state(&pdev->dev);
+
return 0;
}

@@ -2018,13 +2021,18 @@ static int stm32_spi_runtime_suspend(struct device *dev)

clk_disable_unprepare(spi->clk);

- return 0;
+ return pinctrl_pm_select_sleep_state(dev);
}

static int stm32_spi_runtime_resume(struct device *dev)
{
struct spi_master *master = dev_get_drvdata(dev);
struct stm32_spi *spi = spi_master_get_devdata(master);
+ int ret;
+
+ ret = pinctrl_pm_select_default_state(dev);
+ if (ret)
+ return ret;

return clk_prepare_enable(spi->clk);
}
@@ -2054,10 +2062,23 @@ static int stm32_spi_resume(struct device *dev)
return ret;

ret = spi_master_resume(master);
- if (ret)
+ if (ret) {
clk_disable_unprepare(spi->clk);
+ return ret;
+ }

- return ret;
+ ret = pm_runtime_get_sync(dev);
+ if (ret) {
+ dev_err(dev, "Unable to power device:%d\n", ret);
+ return ret;
+ }
+
+ spi->cfg->config(spi);
+
+ pm_runtime_mark_last_busy(dev);
+ pm_runtime_put_autosuspend(dev);
+
+ return 0;
}
#endif

--
2.7.4