| From 0078d23c468b3b3fd73d65f1652de0b355b95081 Mon Sep 17 00:00:00 2001 |
| From: Sam Shih <sam.shih@mediatek.com> |
| Date: Fri, 2 Jun 2023 13:06:18 +0800 |
| Subject: [PATCH] |
| [spi-and-storage][999-2360-v5.16-spi-add-power-control-when-set_cs.patch] |
| |
| --- |
| drivers/spi/spi.c | 24 +++++++++++++++++++++++- |
| 1 file changed, 23 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c |
| index 197a47eab..e562735a3 100644 |
| --- a/drivers/spi/spi.c |
| +++ b/drivers/spi/spi.c |
| @@ -3170,7 +3170,29 @@ int spi_setup(struct spi_device *spi) |
| if (spi->controller->setup) |
| status = spi->controller->setup(spi); |
| |
| - spi_set_cs(spi, false); |
| + if (spi->controller->auto_runtime_pm && spi->controller->set_cs) { |
| + status = pm_runtime_get_sync(spi->controller->dev.parent); |
| + if (status < 0) { |
| + pm_runtime_put_noidle(spi->controller->dev.parent); |
| + dev_err(&spi->controller->dev, "Failed to power device: %d\n", |
| + status); |
| + return status; |
| + } |
| + |
| + /* |
| + * We do not want to return positive value from pm_runtime_get, |
| + * there are many instances of devices calling spi_setup() and |
| + * checking for a non-zero return value instead of a negative |
| + * return value. |
| + */ |
| + status = 0; |
| + |
| + spi_set_cs(spi, false); |
| + pm_runtime_mark_last_busy(spi->controller->dev.parent); |
| + pm_runtime_put_autosuspend(spi->controller->dev.parent); |
| + } else { |
| + spi_set_cs(spi, false); |
| + } |
| |
| if (spi->rt && !spi->controller->rt) { |
| spi->controller->rt = true; |
| -- |
| 2.34.1 |
| |