diff mbox

ARM: shmobile: pm-rmobile: Postpone call to pm_genpd_init()

Message ID 1462350466-20466-1-git-send-email-geert+renesas@glider.be (mailing list archive)
State Accepted
Commit 85d9bf152bdaa7e98a05cc460aa6880efdf0b433
Delegated to: Geert Uytterhoeven
Headers show

Commit Message

Geert Uytterhoeven May 4, 2016, 8:27 a.m. UTC
All local setup of the generic_pm_domain structure should have been
completed before calling pm_genpd_init().

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm/mach-shmobile/pm-rmobile.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ulf Hansson May 9, 2016, 7:51 a.m. UTC | #1
On 4 May 2016 at 10:27, Geert Uytterhoeven <geert+renesas@glider.be> wrote:
> All local setup of the generic_pm_domain structure should have been
> completed before calling pm_genpd_init().
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>

Kind regards
Uffe

> ---
>  arch/arm/mach-shmobile/pm-rmobile.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c
> index ecc92bad3500c1c1..175bd3d91ebcbcb4 100644
> --- a/arch/arm/mach-shmobile/pm-rmobile.c
> +++ b/arch/arm/mach-shmobile/pm-rmobile.c
> @@ -131,13 +131,13 @@ static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd)
>         struct dev_power_governor *gov = rmobile_pd->gov;
>
>         genpd->flags = GENPD_FLAG_PM_CLK;
> -       pm_genpd_init(genpd, gov ? : &simple_qos_governor, false);
>         genpd->dev_ops.active_wakeup    = rmobile_pd_active_wakeup;
>         genpd->power_off                = rmobile_pd_power_down;
>         genpd->power_on                 = rmobile_pd_power_up;
>         genpd->attach_dev               = cpg_mstp_attach_dev;
>         genpd->detach_dev               = cpg_mstp_detach_dev;
>         __rmobile_pd_power_up(rmobile_pd, false);
> +       pm_genpd_init(genpd, gov ? : &simple_qos_governor, false);
>  }
>
>  static int rmobile_pd_suspend_busy(void)
> --
> 1.9.1
>
Simon Horman May 10, 2016, 12:01 a.m. UTC | #2
On Mon, May 09, 2016 at 09:51:05AM +0200, Ulf Hansson wrote:
> On 4 May 2016 at 10:27, Geert Uytterhoeven <geert+renesas@glider.be> wrote:
> > All local setup of the generic_pm_domain structure should have been
> > completed before calling pm_genpd_init().
> >
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> 
> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>

Hi Geert,

I have it in mind to queue this up for v4.8.
Please let me know if you have other ideas.
Simon Horman May 20, 2016, 4:24 a.m. UTC | #3
On Tue, May 10, 2016 at 09:01:35AM +0900, Simon Horman wrote:
> On Mon, May 09, 2016 at 09:51:05AM +0200, Ulf Hansson wrote:
> > On 4 May 2016 at 10:27, Geert Uytterhoeven <geert+renesas@glider.be> wrote:
> > > All local setup of the generic_pm_domain structure should have been
> > > completed before calling pm_genpd_init().
> > >
> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > 
> > Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
> 
> Hi Geert,
> 
> I have it in mind to queue this up for v4.8.
> Please let me know if you have other ideas.

I have queued this up for v4.8.
diff mbox

Patch

diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c
index ecc92bad3500c1c1..175bd3d91ebcbcb4 100644
--- a/arch/arm/mach-shmobile/pm-rmobile.c
+++ b/arch/arm/mach-shmobile/pm-rmobile.c
@@ -131,13 +131,13 @@  static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd)
 	struct dev_power_governor *gov = rmobile_pd->gov;
 
 	genpd->flags = GENPD_FLAG_PM_CLK;
-	pm_genpd_init(genpd, gov ? : &simple_qos_governor, false);
 	genpd->dev_ops.active_wakeup	= rmobile_pd_active_wakeup;
 	genpd->power_off		= rmobile_pd_power_down;
 	genpd->power_on			= rmobile_pd_power_up;
 	genpd->attach_dev		= cpg_mstp_attach_dev;
 	genpd->detach_dev		= cpg_mstp_detach_dev;
 	__rmobile_pd_power_up(rmobile_pd, false);
+	pm_genpd_init(genpd, gov ? : &simple_qos_governor, false);
 }
 
 static int rmobile_pd_suspend_busy(void)