ARM / shmobile: Use pm_genpd_poweroff_unused()
Make shmobile use pm_genpd_poweroff_unused() instead of the
open-coded powering off PM domains without devices in use.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Magnus Damm <damm@opensource.se>
diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h
index 73a76d7..06aecb3 100644
--- a/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@ -12,7 +12,6 @@
struct cpuidle_device;
extern void (*shmobile_cpuidle_modes[])(void);
extern void (*shmobile_cpuidle_setup)(struct cpuidle_device *dev);
-extern void (*shmobile_runtime_pm_late_init)(void);
extern void sh7367_init_irq(void);
extern void sh7367_add_early_devices(void);
diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c
index 71400ea..f47281a 100644
--- a/arch/arm/mach-shmobile/pm-sh7372.c
+++ b/arch/arm/mach-shmobile/pm-sh7372.c
@@ -126,17 +126,6 @@
return true;
}
-static void sh7372_late_pm_domain_off(void)
-{
- /* request power down of unused pm domains */
- queue_work(pm_wq, &sh7372_a4lc.genpd.power_off_work);
- queue_work(pm_wq, &sh7372_a4mp.genpd.power_off_work);
- queue_work(pm_wq, &sh7372_d4.genpd.power_off_work);
- queue_work(pm_wq, &sh7372_a3rv.genpd.power_off_work);
- queue_work(pm_wq, &sh7372_a3ri.genpd.power_off_work);
- queue_work(pm_wq, &sh7372_a3sg.genpd.power_off_work);
-}
-
void sh7372_init_pm_domain(struct sh7372_pm_domain *sh7372_pd)
{
struct generic_pm_domain *genpd = &sh7372_pd->genpd;
@@ -157,8 +146,6 @@
genpd->power_on = pd_power_up;
}
genpd->power_on(&sh7372_pd->genpd);
-
- shmobile_runtime_pm_late_init = sh7372_late_pm_domain_off;
}
void sh7372_add_device_to_domain(struct sh7372_pm_domain *sh7372_pd,
diff --git a/arch/arm/mach-shmobile/pm_runtime.c b/arch/arm/mach-shmobile/pm_runtime.c
index 2f6ded5..6ec454e 100644
--- a/arch/arm/mach-shmobile/pm_runtime.c
+++ b/arch/arm/mach-shmobile/pm_runtime.c
@@ -14,6 +14,7 @@
#include <linux/kernel.h>
#include <linux/io.h>
#include <linux/pm_runtime.h>
+#include <linux/pm_domain.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
#include <linux/sh_clk.h>
@@ -57,12 +58,9 @@
}
core_initcall(sh_pm_runtime_init);
-void (*shmobile_runtime_pm_late_init)(void);
-
static int __init sh_pm_runtime_late_init(void)
{
- if (shmobile_runtime_pm_late_init)
- shmobile_runtime_pm_late_init();
+ pm_genpd_poweroff_unused();
return 0;
}
late_initcall(sh_pm_runtime_late_init);