Messages in this thread | | | Date | Fri, 26 Sep 2014 20:04:55 +0200 | Subject | Re: [PATCH v3 07/13] ARM: shmobile: R-Mobile: Use generic_pm_domain.attach_dev() for pm_clk setup | From | Geert Uytterhoeven <> |
| |
On Thu, Sep 25, 2014 at 6:28 PM, Geert Uytterhoeven <geert+renesas@glider.be> wrote: > diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c > index 717e6413d29cb998..ae846dfcd69293f7 100644 > --- a/arch/arm/mach-shmobile/pm-rmobile.c > +++ b/arch/arm/mach-shmobile/pm-rmobile.c > @@ -101,6 +101,17 @@ static bool rmobile_pd_active_wakeup(struct device *dev) > return true; > } > > +static void rmobile_pd_attach_dev(struct device *dev) > +{ > + if (pm_clk_no_clocks(dev)) > + pm_clk_add(dev, NULL);
With !CONFIG_PM_RUNTIME, this doesn't work well in the DT case, as the clocks are no longer enabled by runtime PM (some clocks may have been enabled by boot loader/reset state though).
In the legacy case, this works more or less, as genpd takes over after the pm_clk domain has been initialized, which implies enabling the clocks if !CONFIG_PM_RUNTIME.
Will fix...
> +} > + > +static void rmobile_pd_detach_dev(struct device *dev) > +{ > + pm_clk_remove(dev, NULL); > +} > + > static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd) > { > struct generic_pm_domain *genpd = &rmobile_pd->genpd; > @@ -112,6 +123,8 @@ static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd) > 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 = rmobile_pd_attach_dev; > + genpd->detach_dev = rmobile_pd_detach_dev; > __rmobile_pd_power_up(rmobile_pd, false); > } > > @@ -130,8 +143,6 @@ void rmobile_add_device_to_domain_td(const char *domain_name, > struct device *dev = &pdev->dev; > > __pm_genpd_name_add_device(domain_name, dev, td); > - if (pm_clk_no_clocks(dev)) > - pm_clk_add(dev, NULL); > } > > void rmobile_add_devices_to_domains(struct pm_domain_device data[],
Gr{oetje,eeting}s,
Geert
-- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
| |