]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
spi: add power control when set_cs
authorLuhua Xu <luhua.xu@mediatek.com>
Wed, 30 Oct 2019 09:03:54 +0000 (17:03 +0800)
committerMark Brown <broonie@kernel.org>
Thu, 31 Oct 2019 13:20:58 +0000 (14:20 +0100)
As to set_cs takes effect immediately, power spi
is needed when setup spi.

Cc: Mark Brown <broonie@kernel.org>
Signed-off-by: Luhua Xu <luhua.xu@mediatek.com>
Link: https://lore.kernel.org/r/1572426234-30019-1-git-send-email-luhua.xu@mediatek.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi.c

index 5ba19ef809c26f172c5fa53b0ac775625b2b0eeb..294d0038eea6d0e21dbb000a6c0aa0c9826c7df0 100644 (file)
@@ -3261,7 +3261,20 @@ 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;
+               }
+               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;