diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-21 12:02:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-21 12:02:27 -0700 |
| commit | ac2fc4b9d5b7d8e4878c6f04f947d42707f782ef (patch) | |
| tree | 859e61035483e3d220497aa37f39a2c8aec3e2b3 /drivers | |
| parent | 90a835f5d19217ad1e174e40ef35d0acf3357828 (diff) | |
| parent | cbc41d0a761bffb3166a413a3c77100a737c0cd7 (diff) | |
| download | linux-stable-ac2fc4b9d5b7d8e4878c6f04f947d42707f782ef.tar.gz linux-stable-ac2fc4b9d5b7d8e4878c6f04f947d42707f782ef.tar.bz2 linux-stable-ac2fc4b9d5b7d8e4878c6f04f947d42707f782ef.zip | |
Merge tag 'renesas-sh-drivers-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas
Pull SH drivers updates from Simon Horman:
"I am sending this change after v4.3-rc1 has been released as it
depends on SoC changes which are present in that rc release.
Summary:
- disable PM runtime for multi-platform ARM with genpd
- disable legacy default PM Domain on emev2"
* tag 'renesas-sh-drivers-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
drivers: sh: Disable PM runtime for multi-platform ARM with genpd
drivers: sh: Disable legacy default PM Domain on emev2
Diffstat (limited to 'drivers')
| -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; } |