diff options
| author | Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:33 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:33 +0000 |
| commit | 8f3ed6d0b0db04db8297d951c26c809dd7b4778d (patch) | |
| tree | 5813c89fa9245eb00e617b6dab89ddfe4a029184 /drivers/spi/spi-dw-mmio.c | |
| parent | af42d3466bdc8f39806b26f593604fdc54140bcb (diff) | |
| parent | c5923243eb3208ea63b5ed7905610039c4ca5201 (diff) | |
Merge branch 'spi-5.4' into spi-linus
Diffstat (limited to 'drivers/spi/spi-dw-mmio.c')
| -rw-r--r-- | drivers/spi/spi-dw-mmio.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c index bd46fca3f094..db896475b8d1 100644 --- a/drivers/spi/spi-dw-mmio.c +++ b/drivers/spi/spi-dw-mmio.c @@ -9,6 +9,7 @@ #include <linux/err.h> #include <linux/interrupt.h> #include <linux/platform_device.h> +#include <linux/pm_runtime.h> #include <linux/slab.h> #include <linux/spi/spi.h> #include <linux/scatterlist.h> @@ -193,6 +194,8 @@ static int dw_spi_mmio_probe(struct platform_device *pdev) goto out; } + pm_runtime_enable(&pdev->dev); + ret = dw_spi_add_host(&pdev->dev, dws); if (ret) goto out; @@ -201,6 +204,7 @@ static int dw_spi_mmio_probe(struct platform_device *pdev) return 0; out: + pm_runtime_disable(&pdev->dev); clk_disable_unprepare(dwsmmio->pclk); out_clk: clk_disable_unprepare(dwsmmio->clk); @@ -212,6 +216,7 @@ static int dw_spi_mmio_remove(struct platform_device *pdev) struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev); dw_spi_remove_host(&dwsmmio->dws); + pm_runtime_disable(&pdev->dev); clk_disable_unprepare(dwsmmio->pclk); clk_disable_unprepare(dwsmmio->clk); |