Commit ac2fc4b9 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'renesas-sh-drivers-for-v4.3' of...

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
parents 90a835f5 cbc41d0a
...@@ -35,20 +35,11 @@ static struct pm_clk_notifier_block platform_bus_notifier = { ...@@ -35,20 +35,11 @@ static struct pm_clk_notifier_block platform_bus_notifier = {
static int __init sh_pm_runtime_init(void) static int __init sh_pm_runtime_init(void)
{ {
if (IS_ENABLED(CONFIG_ARCH_SHMOBILE_MULTI)) { if (IS_ENABLED(CONFIG_ARCH_SHMOBILE_MULTI)) {
if (!of_machine_is_compatible("renesas,emev2") && if (!of_find_compatible_node(NULL, NULL,
!of_machine_is_compatible("renesas,r7s72100") && "renesas,cpg-mstp-clocks"))
#ifndef CONFIG_PM_GENERIC_DOMAINS_OF return 0;
!of_machine_is_compatible("renesas,r8a73a4") && if (IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS_OF) &&
!of_machine_is_compatible("renesas,r8a7740") && of_find_node_with_property(NULL, "#power-domain-cells"))
!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"))
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment