xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

soc: ti: pm33xx: Enable basic PM runtime support for genpd

Browse Source 
[ Upstream commit 74033131d2467fda6b76ba10bc80a75fb47e03d1 ]

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>
Stable-dep-of: 8f3c307b580a ("soc: ti: pm33xx: Fix refcount leak in am33xx_pm_probe")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Tony Lindgren
2020-11-16 12:57:13 +02:00
committed by Greg Kroah-Hartman
parent e33f374d65
commit a1e6a4161a
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/soc/ti/pm33xx.c
View File

@@ -19,6 +19,7 @@
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/platform_data/pm33xx.h> #include <linux/platform_data/pm33xx.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm_runtime.h>
#include <linux/rtc.h> #include <linux/rtc.h>
#include <linux/rtc/rtc-omap.h> #include <linux/rtc/rtc-omap.h>
#include <linux/sizes.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; suspend_wfi_flags |= WFI_FLAG_WAKE_M3;
#endif /* CONFIG_SUSPEND */ #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); ret = pm_ops->init(am33xx_do_sram_idle);
if (ret) { if (ret) {
dev_err(dev, "Unable to call core pm init!\n"); dev_err(dev, "Unable to call core pm init!\n");
ret = -ENODEV; ret = -ENODEV;
goto err_put_wkup_m3_ipc; goto err_pm_runtime_put;
} }
return 0; 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); wkup_m3_ipc_put(m3_ipc);
err_unsetup_rtc: err_unsetup_rtc:
iounmap(rtc_base_virt); iounmap(rtc_base_virt);
@@ -577,6 +588,8 @@ err_free_sram:
static int am33xx_pm_remove(struct platform_device *pdev) static int am33xx_pm_remove(struct platform_device *pdev)
{ {
pm_runtime_put_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev);
if (pm_ops->deinit) if (pm_ops->deinit)
pm_ops->deinit(); pm_ops->deinit();
suspend_set_ops(NULL); suspend_set_ops(NULL);