| From 65f83a72556e167909fe7e962b369d93b466ef61 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Tue, 7 Nov 2017 13:48:12 +0100 |
| Subject: [PATCH 0391/1795] ARM: shmobile: pm-rmobile: Use |
| GENPD_FLAG_ACTIVE_WAKEUP |
| |
| Set the newly introduced GENPD_FLAG_ACTIVE_WAKEUP, which allows to |
| remove the driver's own "always true" callback. |
| |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Acked-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Acked-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> |
| (cherry picked from commit eb0ddf9dd22be098301ab8a09e9be5a13ae8c804) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| arch/arm/mach-shmobile/pm-rmobile.c | 8 +------- |
| 1 file changed, 1 insertion(+), 7 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c |
| index 3a4ed4c33a68..e348bcfe389d 100644 |
| --- a/arch/arm/mach-shmobile/pm-rmobile.c |
| +++ b/arch/arm/mach-shmobile/pm-rmobile.c |
| @@ -120,18 +120,12 @@ static int rmobile_pd_power_up(struct generic_pm_domain *genpd) |
| return __rmobile_pd_power_up(to_rmobile_pd(genpd), true); |
| } |
| |
| -static bool rmobile_pd_active_wakeup(struct device *dev) |
| -{ |
| - return true; |
| -} |
| - |
| static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd) |
| { |
| struct generic_pm_domain *genpd = &rmobile_pd->genpd; |
| struct dev_power_governor *gov = rmobile_pd->gov; |
| |
| - genpd->flags |= GENPD_FLAG_PM_CLK; |
| - genpd->dev_ops.active_wakeup = rmobile_pd_active_wakeup; |
| + genpd->flags |= GENPD_FLAG_PM_CLK | GENPD_FLAG_ACTIVE_WAKEUP; |
| genpd->power_off = rmobile_pd_power_down; |
| genpd->power_on = rmobile_pd_power_up; |
| genpd->attach_dev = cpg_mstp_attach_dev; |
| -- |
| 2.19.0 |
| |
