drivers: sh: Disable PM runtime for multi-platform r8a73a4 with genpd
authorGeert Uytterhoeven <geert+renesas@glider.be>
Tue, 17 Feb 2015 15:43:03 +0000 (16:43 +0100)
committerSimon Horman <horms+renesas@verge.net.au>
Mon, 27 Apr 2015 04:08:13 +0000 (13:08 +0900)
If the default PM domain using PM_CLK is used for PM runtime, the real PM
domain(s) cannot be registered from DT later.

Hence do not enable it when running a multi-platform kernel with genpd
support on an r8a73a4. The R-Mobile PM domain driver will take care of
PM runtime management of the module clocks.

The default PM domain is still needed for:
  - platforms without genpd support,
  - the legacy (non-DT) case, where genpd may take over later, except
    for the C5 "always on" PM domain.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
drivers/sh/pm_runtime.c

index 6b16a67ba618b7934c780f245e0dad4d8a84b025..89b7785de1fcf5b7228c67cc5893a9e2b7a3a738 100644 (file)
@@ -80,8 +80,8 @@ 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") &&
-                   !of_machine_is_compatible("renesas,r8a73a4") &&
 #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