Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac2fc4b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

drivers/sh/pm_runtime.c

+5 −14
Original line number Diff line number Diff line
@@ -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;

	}