| Message ID | 1432839219-475-13-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, May 28, 2015 at 8:53 PM, Geert Uytterhoeven <geert+renesas@glider.be> wrote: > Now most multi-platform ARM shmobile platforms (SH-Mobile, R-Mobile, > R-Car, RZ) use the CPG Clock Domain to take care of PM runtime > management of the module clocks, we no longer need the legacy default PM > domain hack, which also prevented registering the real PM domain. > > EMMA Mobile EV2 doesn't have MSTP clocks and doesn't use the CPG Clock > Domain. But all its device drivers manage clocks explicitly, without > relying on Runtime PM, so it doesn't need the legacy default PM hack > neither. > > Hence do not compile it when running an ARM multi-platform kernel with > genpd support. > > The default PM domain is still needed: > - for legacy SuperH, > - for legacy (non-DT) ARM/shmobile platforms > - without genpd support (r8a7778, r8a7779), > - with genpd support, for devices in the "C5" always-on power > area (r8a7740, sh73a0), > - for the CONFIG_PM=n case. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> > --- > v2: > - Add Reviewed-by, > - Just stop compiling pm_runtime.c instead of using a runtime check, > as no multi-platform ARM platforms need this anymore. The runtime check must stay for the ARM multiplatform CONFIG_PM=n case, to prevent the code from running on non-shmobile machines. Will fix. 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
diff --git a/drivers/sh/Makefile b/drivers/sh/Makefile index 114203f32843216f..786924c34436085e 100644 --- a/drivers/sh/Makefile +++ b/drivers/sh/Makefile @@ -8,4 +8,8 @@ endif obj-$(CONFIG_MAPLE) += maple/ obj-$(CONFIG_SUPERHYWAY) += superhyway/ +obj-$(CONFIG_ARCH_SHMOBILE_LEGACY) += pm_runtime.o +obj-$(CONFIG_SUPERH) += pm_runtime.o +ifneq ($(CONFIG_PM),y) obj-y += pm_runtime.o +endif diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c index d3d1891cda3cf9a8..c887ecdaf19b7c10 100644 --- a/drivers/sh/pm_runtime.c +++ b/drivers/sh/pm_runtime.c @@ -34,24 +34,6 @@ static struct pm_clk_notifier_block platform_bus_notifier = { static int __init sh_pm_runtime_init(void) { - if (IS_ENABLED(CONFIG_ARCH_SHMOBILE_MULTI)) { - if (!of_machine_is_compatible("renesas,emev2") && - !of_machine_is_compatible("renesas,r7s72100") && -#ifndef CONFIG_PM_GENERIC_DOMAINS_OF - !of_machine_is_compatible("renesas,r8a73a4") && - !of_machine_is_compatible("renesas,r8a7740") && - !of_machine_is_compatible("renesas,sh73a0") && -#endif - !of_machine_is_compatible("renesas,r8a7778") && - !of_machine_is_compatible("renesas,r8a7779") && - !of_machine_is_compatible("renesas,r8a7790") && - !of_machine_is_compatible("renesas,r8a7791") && - !of_machine_is_compatible("renesas,r8a7792") && - !of_machine_is_compatible("renesas,r8a7793") && - !of_machine_is_compatible("renesas,r8a7794")) - return 0; - } - pm_clk_add_notifier(&platform_bus_type, &platform_bus_notifier); return 0; }
Now most multi-platform ARM shmobile platforms (SH-Mobile, R-Mobile, R-Car, RZ) use the CPG Clock Domain to take care of PM runtime management of the module clocks, we no longer need the legacy default PM domain hack, which also prevented registering the real PM domain. EMMA Mobile EV2 doesn't have MSTP clocks and doesn't use the CPG Clock Domain. But all its device drivers manage clocks explicitly, without relying on Runtime PM, so it doesn't need the legacy default PM hack neither. Hence do not compile it when running an ARM multi-platform kernel with genpd support. The default PM domain is still needed: - for legacy SuperH, - for legacy (non-DT) ARM/shmobile platforms - without genpd support (r8a7778, r8a7779), - with genpd support, for devices in the "C5" always-on power area (r8a7740, sh73a0), - for the CONFIG_PM=n case. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> --- v2: - Add Reviewed-by, - Just stop compiling pm_runtime.c instead of using a runtime check, as no multi-platform ARM platforms need this anymore. --- drivers/sh/Makefile | 4 ++++ drivers/sh/pm_runtime.c | 18 ------------------ 2 files changed, 4 insertions(+), 18 deletions(-)