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

Commit 73be174c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Merge tag 'renesas-sh-drivers-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

Pull SH driver updates from Simon Horman:

 - remove test for now unsupported sh7372 SoC

 - disable PM runtime for multi-platform r8a73a4 and sh73a0 SoCs with
   genpd

* tag 'renesas-sh-drivers-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  drivers: sh: Remove test for now unsupported sh7372
  drivers: sh: Disable PM runtime for multi-platform r8a73a4 with genpd
  drivers: sh: Disable PM runtime for multi-platform sh73a0 with genpd
parents 3d99e3fe 00170528

drivers/sh/pm_runtime.c

+3 −4
Original line number Diff line number Diff line
@@ -80,9 +80,10 @@ 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") &&

		    !of_machine_is_compatible("renesas,r8a73a4") &&

#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") &&
@@ -90,9 +91,7 @@ static int __init sh_pm_runtime_init(void) 
		    !of_machine_is_compatible("renesas,r8a7791") &&

		    !of_machine_is_compatible("renesas,r8a7792") &&

		    !of_machine_is_compatible("renesas,r8a7793") &&

		    !of_machine_is_compatible("renesas,r8a7794") &&

		    !of_machine_is_compatible("renesas,sh7372") &&

		    !of_machine_is_compatible("renesas,sh73a0"))

		    !of_machine_is_compatible("renesas,r8a7794"))

			return 0;

	}