diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-23 09:52:03 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-23 09:52:03 +0200 |
| commit | 4bbffe718fe1bfae6176a6fb783c1576b69338e5 (patch) | |
| tree | e4d25102f0d2fa2a3480e03ba7bde45c9958511e /drivers/sh/pm_runtime.c | |
| parent | ac742d37180bee83bc433be087b66a17af2883b9 (diff) | |
| parent | 21199f27b430576552b26210b3194a363d7f05cd (diff) | |
| download | talos-op-linux-4bbffe718fe1bfae6176a6fb783c1576b69338e5.tar.gz talos-op-linux-4bbffe718fe1bfae6176a6fb783c1576b69338e5.zip | |
Merge branch 'locking/urgent' into locking/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/sh/pm_runtime.c')
| -rw-r--r-- | drivers/sh/pm_runtime.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c index d3d1891cda3c..25abd4eb7d10 100644 --- a/drivers/sh/pm_runtime.c +++ b/drivers/sh/pm_runtime.c @@ -35,20 +35,11 @@ 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")) + if (!of_find_compatible_node(NULL, NULL, + "renesas,cpg-mstp-clocks")) + return 0; + if (IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS_OF) && + of_find_node_with_property(NULL, "#power-domain-cells")) return 0; } |
