[PATCH/RFC 5/5] drivers: sh: Disable PM runtime for multi-platform R-Car Gen2 with genpd
From: geert+renesas@glider.be (Geert Uytterhoeven)
Date: 2015-03-18 19:46:57
Also in:
linux-devicetree, linux-pm, linux-sh
Subsystem:
superh, the rest · Maintainers:
Yoshinori Sato, Rich Felker, John Paul Adrian Glaubitz, Linus Torvalds
Now we have an R-Car Gen2 CPG Clock Domain driver using the generic PM domain to take care of PM runtime management of the module clocks, we no longer need the legacy default PM domain hack, which also prevents registering the real PM domain. Hence do not enable it when running a multi-platform kernel with genpd support on an R-Car Gen2 SoC. The default PM domain is still needed: - for platforms without genpd support, - for the legacy (non-DT) case, where genpd may take over later, - if genpd is not enabled. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/sh/pm_runtime.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c
index fe8875f0d7be1155..97d5738f21ae8f04 100644
--- a/drivers/sh/pm_runtime.c
+++ b/drivers/sh/pm_runtime.c@@ -83,15 +83,15 @@ static int __init sh_pm_runtime_init(void) #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")) + !of_machine_is_compatible("renesas,r8a7794") && + !of_machine_is_compatible("renesas,sh73a0") && +#endif + !of_machine_is_compatible("renesas,r8a7778") && + !of_machine_is_compatible("renesas,r8a7779")) return 0; }
--
1.9.1