tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+5
-14
+5
-14
drivers/sh/pm_runtime.c
+5
-14
drivers/sh/pm_runtime.c
···
35
35
static int __init sh_pm_runtime_init(void)
36
36
{
37
37
if (IS_ENABLED(CONFIG_ARCH_SHMOBILE_MULTI)) {
38
-
if (!of_machine_is_compatible("renesas,emev2") &&
39
-
!of_machine_is_compatible("renesas,r7s72100") &&
40
-
#ifndef CONFIG_PM_GENERIC_DOMAINS_OF
41
-
!of_machine_is_compatible("renesas,r8a73a4") &&
42
-
!of_machine_is_compatible("renesas,r8a7740") &&
43
-
!of_machine_is_compatible("renesas,sh73a0") &&
44
-
#endif
45
-
!of_machine_is_compatible("renesas,r8a7778") &&
46
-
!of_machine_is_compatible("renesas,r8a7779") &&
47
-
!of_machine_is_compatible("renesas,r8a7790") &&
48
-
!of_machine_is_compatible("renesas,r8a7791") &&
49
-
!of_machine_is_compatible("renesas,r8a7792") &&
50
-
!of_machine_is_compatible("renesas,r8a7793") &&
51
-
!of_machine_is_compatible("renesas,r8a7794"))
38
+
if (!of_find_compatible_node(NULL, NULL,
39
+
"renesas,cpg-mstp-clocks"))
40
+
return 0;
41
+
if (IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS_OF) &&
42
+
of_find_node_with_property(NULL, "#power-domain-cells"))
52
43
return 0;
53
44
}
54
45