spi: bcm63xx-hsspi: fix pm_runtime
authorÁlvaro Fernández Rojas <noltari@gmail.com>
Tue, 23 Feb 2021 15:18:51 +0000 (16:18 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 10 Mar 2021 12:25:12 +0000 (12:25 +0000)
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>
drivers/spi/spi-bcm63xx-hsspi.c

index 1f08d75..b871fd8 100644 (file)
@@ -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: