spi: bcm63xx-hsspi: fix pm_runtime

[linux-2.6-microblaze.git] / drivers / spi / spi-bcm63xx-hsspi.c

diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c
index 1f08d75..b871fd8 100644 (file)
--- a/drivers/spi/spi-bcm63xx-hsspi.c
+++ b/drivers/spi/spi-bcm63xx-hsspi.c
@@ -21,6 +21,7 @@
 #include <linux/mutex.h>
 #include <linux/of.h>
 #include <linux/reset.h>
+#include <linux/pm_runtime.h>
 
 #define HSSPI_GLOBAL_CTRL_REG                  0x0
 #define GLOBAL_CTRL_CS_POLARITY_SHIFT          0
@@ -439,13 +440,17 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev)
        if (ret)
                goto out_put_master;
 
+       pm_runtime_enable(&pdev->dev);
+
        /* register and we are done */
        ret = devm_spi_register_master(dev, master);
        if (ret)
-               goto out_put_master;
+               goto out_pm_disable;
 
        return 0;
 
+out_pm_disable:
+       pm_runtime_disable(&pdev->dev);
 out_put_master:
        spi_master_put(master);
 out_disable_pll_clk: