spi: bcm63xx-hsspi: fix pm_runtime

[ Upstream commit d3c7fc92198ebd7e51a41e3c69bf03a441be7d62 ]

The driver sets auto_runtime_pm to true, but it doesn't call
pm_runtime_enable(), which results in "Failed to power device" when PM support
is enabled.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Link: https://lore.kernel.org/r/20210223151851.4110-3-noltari@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Stable-dep-of: 811ff802aaf8 ("spi: bcm63xx-hsspi: Fix multi-bit mode setting")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c
index 509476a2d79bb40c1f68521c84f87fefda17ab60..55087005fb509e348efda88b53bd1beed091fc13 100644 (file)
--- a/drivers/spi/spi-bcm63xx-hsspi.c
+++ b/drivers/spi/spi-bcm63xx-hsspi.c
@@ -20,6 +20,8 @@
 #include <linux/spi/spi.h>
 #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
@@ -428,13 +430,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: