diff options
| author | leilk.liu <leilk.liu@mediatek.com> | 2021-02-07 11:09:51 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-02-08 11:41:21 +0000 |
| commit | 4cea6b8cc34ee61358d681bd2009b8bac1736ffe (patch) | |
| tree | 705b1f0bb20cb57e789f19d59d33939c19c0f6d6 /drivers/spi | |
| parent | c64e7efe46b7de21937ef4b3594d9b1fc74f07df (diff) | |
| download | linux-stable-4cea6b8cc34ee61358d681bd2009b8bac1736ffe.tar.gz linux-stable-4cea6b8cc34ee61358d681bd2009b8bac1736ffe.tar.bz2 linux-stable-4cea6b8cc34ee61358d681bd2009b8bac1736ffe.zip | |
spi: add power control when set_cs_timing
As to set_cs_timing takes effect immediately, power spi
is needed when call spi_set_cs_timing.
Signed-off-by: leilk.liu <leilk.liu@mediatek.com>
Link: https://lore.kernel.org/r/20210207030953.9297-2-leilk.liu@mediatek.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi.c | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index a17efa8c3047..21ea3e8a00e2 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -3460,11 +3460,30 @@ EXPORT_SYMBOL_GPL(spi_setup); int spi_set_cs_timing(struct spi_device *spi, struct spi_delay *setup, struct spi_delay *hold, struct spi_delay *inactive) { + struct device *parent = spi->controller->dev.parent; size_t len; + int status; + + if (spi->controller->set_cs_timing) { + if (spi->controller->auto_runtime_pm) { + status = pm_runtime_get_sync(parent); + if (status < 0) { + pm_runtime_put_noidle(parent); + dev_err(&spi->controller->dev, "Failed to power device: %d\n", + status); + return status; + } - if (spi->controller->set_cs_timing) - return spi->controller->set_cs_timing(spi, setup, hold, - inactive); + status = spi->controller->set_cs_timing(spi, setup, + hold, inactive); + pm_runtime_mark_last_busy(parent); + pm_runtime_put_autosuspend(parent); + return status; + } else { + return spi->controller->set_cs_timing(spi, setup, hold, + inactive); + } + } if ((setup && setup->unit == SPI_DELAY_UNIT_SCK) || (hold && hold->unit == SPI_DELAY_UNIT_SCK) || |