Merge branch 'spi-5.5' into spi-next

[linux-2.6-microblaze.git] / drivers / spi / spi-dw-mmio.c

diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c
index b5ce8bd..384a3ab 100644 (file)
--- 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);