]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
soc: ti: pm33xx: Enable basic PM runtime support for genpd
authorTony Lindgren <tony@atomide.com>
Mon, 16 Nov 2020 10:57:13 +0000 (12:57 +0200)
committerTony Lindgren <tony@atomide.com>
Mon, 16 Nov 2020 10:57:38 +0000 (12:57 +0200)
To prepare for moving to use genpd, let's enable basic PM
runtime support.

Cc: Dave Gerlach <d-gerlach@ti.com>
Cc: Santosh Shilimkar <ssantosh@kernel.org>
Cc: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
drivers/soc/ti/pm33xx.c

index d2f5e7001a93ce69e5540d7954757e1d62640512..c1d550e90c316bdeffaf9dcf9677afd32a0deb6f 100644 (file)
@@ -19,6 +19,7 @@
 #include <linux/of_address.h>
 #include <linux/platform_data/pm33xx.h>
 #include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
 #include <linux/rtc.h>
 #include <linux/rtc/rtc-omap.h>
 #include <linux/sizes.h>
@@ -555,16 +556,26 @@ static int am33xx_pm_probe(struct platform_device *pdev)
        suspend_wfi_flags |= WFI_FLAG_WAKE_M3;
 #endif /* CONFIG_SUSPEND */
 
+       pm_runtime_enable(dev);
+       ret = pm_runtime_get_sync(dev);
+       if (ret < 0) {
+               pm_runtime_put_noidle(dev);
+               goto err_pm_runtime_disable;
+       }
+
        ret = pm_ops->init(am33xx_do_sram_idle);
        if (ret) {
                dev_err(dev, "Unable to call core pm init!\n");
                ret = -ENODEV;
-               goto err_put_wkup_m3_ipc;
+               goto err_pm_runtime_put;
        }
 
        return 0;
 
-err_put_wkup_m3_ipc:
+err_pm_runtime_put:
+       pm_runtime_put_sync(dev);
+err_pm_runtime_disable:
+       pm_runtime_disable(dev);
        wkup_m3_ipc_put(m3_ipc);
 err_free_sram:
        am33xx_pm_free_sram();
@@ -574,6 +585,8 @@ err_free_sram:
 
 static int am33xx_pm_remove(struct platform_device *pdev)
 {
+       pm_runtime_put_sync(&pdev->dev);
+       pm_runtime_disable(&pdev->dev);
        if (pm_ops->deinit)
                pm_ops->deinit();
        suspend_set_ops(NULL);