UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

SH Drivers Updates for v4.1 

* Remove test for now unsupported sh7372 SoC
 * Disable PM runtime for multi-platform r8a73a4 and sh73a0 SoCs with genpd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVQbqSAAoJENfPZGlqN0++m9cQAKI5XXWiQgzTWPBOGrKcF03u
 wK5uRR4F0WJyt5zEzXECBw3UWNl9EmfrYmf2u6YCtGnKnDldqtlh0ntN/tKNSN0/
 gJ0hxomPjxJTNWqKoN5kl01vK2tAJS6h+hDsjwen0zgKH6bIGyfTWcP9tN55zAyO
 l+PFFWd5wn4GV3qf23YC4UZyA++Q0V9MDN0KCcniVhBwarxmBj6wbQHvz2YvNLpK
 cebyQuuTGs7sGHYhY0Om5w22oGFM74VG1h/NzJi7jKAqEm9+tCLhYMfdUx5IfBWh
 2e3mM1+cABhEwwVxq/82wzoDULSuRYaW8ebKGlO+cSXrGfRbouMvQRdBAUZjLA2P
 Ml6hB4+BBJrammPmFkLlF8KPm5VPH6ITyxdVw+ZUvuxOqs/rLwe1+Wdm0NelHljz
 +Qu2Qv3ImRZbMm5S5dx0bXuAcKYo1s5jRMQXspuzpWJuSMRnhybj9JHH2fweFntH
 5bng9vTcTFnLxId6/EvL7z+3bEu85Ax4LUJ7WerY+xzY3gA59Od+zYSl3ZIhALoE
 363CIxxvl7OS85lHl2OuFj8s3Yx4N3zWxgO7AnxXRjhJ0GwLfoeZ7NXNvXQHIJ7P
 zAgYMugBlhTr0RPH8PEflI4gXFhVm0J7hb9dlcPVwJvKRNyf8upIC/K9fwFToR3D
 GZiWn1y6337eLLyjkJqw
 =jOnx
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2015-04-30 09:07:26 -07:00
parent 3d99e3fe13 00170528f0
commit 73be174cf5
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/sh/pm_runtime.c
View File

@ -80,9 +80,10 @@ 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_machine_is_compatible("renesas,emev2") &&
!of_machine_is_compatible("renesas,r7s72100") && !of_machine_is_compatible("renesas,r7s72100") &&
!of_machine_is_compatible("renesas,r8a73a4") &&
#ifndef CONFIG_PM_GENERIC_DOMAINS_OF #ifndef CONFIG_PM_GENERIC_DOMAINS_OF
!of_machine_is_compatible("renesas,r8a73a4") &&
!of_machine_is_compatible("renesas,r8a7740") && !of_machine_is_compatible("renesas,r8a7740") &&
!of_machine_is_compatible("renesas,sh73a0") &&
#endif #endif
!of_machine_is_compatible("renesas,r8a7778") && !of_machine_is_compatible("renesas,r8a7778") &&
!of_machine_is_compatible("renesas,r8a7779") && !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,r8a7791") &&
!of_machine_is_compatible("renesas,r8a7792") && !of_machine_is_compatible("renesas,r8a7792") &&
!of_machine_is_compatible("renesas,r8a7793") && !of_machine_is_compatible("renesas,r8a7793") &&
!of_machine_is_compatible("renesas,r8a7794") && !of_machine_is_compatible("renesas,r8a7794"))
!of_machine_is_compatible("renesas,sh7372") &&
!of_machine_is_compatible("renesas,sh73a0"))
return 0; return 0;
} }