* Disable PM runtime for multi-platform r8a7740 with genpd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJU78a4AAoJENfPZGlqN0++B/gP/2LwIu6wS4MGinRkDz6aUb1c
 W57uEn1mH0ePFB5LuJEV2b93zmexhGcCLQ7/v8DGJzjITta/gi4SLJO4gS51sxUU
 UOqWrZVH0EsGlNkD65f64TxJeZzzXQKlzTEOS5luFG7+Nn20tUSNXgxrEIapwOTz
 tQA31b4a7s+Y5GO7BuHft8EoCgToU/D7DMNGFJDtLWDqVwEWe4dJuio+mkX1EATM
 lnkouTg/q6KTaKMZo0YR58mMmBBlczM11TtBctyG2LYphDWFODXM/yu05xGwd4ZN
 g05rC1fGDhTrZ5XV61sW3KyHYlMzNKA26yihkbbGnLKUKAPatfY1AU2gZd9dnOXx
 wVJEbcBFt4ypLdhWtuBJcPkCh8AoLX6+ra4kuaLDVioSJKtJavRqQayc7hdDP4J/
 S0yXEskHX4xK1KCrLDa2LCTCTA7xY7ITYd0NeYHyl7qZ+6ACpf8N1t4yS5Bz23BP
 KsmqMWCYwZjwrmJObgZ02A3Ct/+owzkH+8H6QzH2vjkpoj+sWxIo8z7yXBOy9hmV
 fE707p4EIlsbypVYpUn1MAjR68ByeM93tf1PgLMGRRXznBLc3jCb0C+CqidcgLMb
 1VvkgfFgx7aeW+iRlUbgqafmEb7s1zy+sTTHTHFVHEzhMgEEFT0CdTtxaKVQ/Etz
 sVIKaiaQnLmckeX78s/p
 =4Oic
 -----END PGP SIGNATURE-----

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

Pull SH driver fix from Simon Horman:
 "Disable PM runtime for multi-platform r8a7740 with genpd"

* tag 'renesas-sh-drivers-for-v4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  drivers: sh: Disable PM runtime for multi-platform r8a7740 with genpd
This commit is contained in:
Linus Torvalds 2015-02-27 16:08:45 -08:00
Родитель 4f671fe2f9 a5cb514f1f
Коммит 1c0705151e
1 изменённых файлов: 2 добавлений и 0 удалений

Просмотреть файл

@ -81,7 +81,9 @@ static int __init sh_pm_runtime_init(void)
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,r8a7740") &&
#endif
!of_machine_is_compatible("renesas,r8a7778") &&
!of_machine_is_compatible("renesas,r8a7779") &&
!of_machine_is_compatible("renesas,r8a7790") &&