diff options
| author |   Mark Brown <broonie@kernel.org> | 2020-10-26 20:28:19 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-10-26 20:28:19 +0000 |
| commit | 2ee1b42e8a0d698daf5553257e51432f84c230f7 (patch) | |
| tree | 7e990a251c825482216a0355177ef80874b3c0cb /drivers/spi/spi-imx.c | |
| parent | Linux 5.10-rc1 (diff) | |
| parent | spi: imx: fix runtime pm support for !CONFIG_PM (diff) | |
| download | linux-dev-2ee1b42e8a0d698daf5553257e51432f84c230f7.tar.xz linux-dev-2ee1b42e8a0d698daf5553257e51432f84c230f7.zip | |
Merge existing fixes from spi/for-5.10
Diffstat (limited to 'drivers/spi/spi-imx.c')
| -rw-r--r-- | drivers/spi/spi-imx.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index 060b1f5c9b04..4b80e27ecdbf 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -1676,15 +1676,18 @@ static int spi_imx_probe(struct platform_device *pdev) goto out_master_put; } - pm_runtime_enable(spi_imx->dev); + ret = clk_prepare_enable(spi_imx->clk_per); + if (ret) + goto out_master_put; + + ret = clk_prepare_enable(spi_imx->clk_ipg); + if (ret) + goto out_put_per; + pm_runtime_set_autosuspend_delay(spi_imx->dev, MXC_RPM_TIMEOUT); pm_runtime_use_autosuspend(spi_imx->dev); - - ret = pm_runtime_get_sync(spi_imx->dev); - if (ret < 0) { - dev_err(spi_imx->dev, "failed to enable clock\n"); - goto out_runtime_pm_put; - } + pm_runtime_set_active(spi_imx->dev); + pm_runtime_enable(spi_imx->dev); spi_imx->spi_clk = clk_get_rate(spi_imx->clk_per); /* @@ -1722,8 +1725,12 @@ out_bitbang_start: spi_imx_sdma_exit(spi_imx); out_runtime_pm_put: pm_runtime_dont_use_autosuspend(spi_imx->dev); - pm_runtime_put_sync(spi_imx->dev); + pm_runtime_set_suspended(&pdev->dev); pm_runtime_disable(spi_imx->dev); + + clk_disable_unprepare(spi_imx->clk_ipg); +out_put_per: + clk_disable_unprepare(spi_imx->clk_per); out_master_put: spi_master_put(master); |