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

Renesas ARM Based SoC Updates for v4.13 

* Use GENPD_FLAG_ALWAYS_ON in pm-rmobile
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJZQ9yHAAoJENfPZGlqN0++e24P/1LMPbav2HSUkCVTOTyXvsYW
 iKwz90zBtGZpaQx9vxItUmzYw7NKbfc3qz3Nw6e7Jvyz2lQH2FucFjyIvdNlwQl5
 c5h5fzmQb+4ci+nGiQxOQpSq3yNkXk4jqTiJr4xRCuSSvnQcvhO8x1iv0Gtn7qHk
 YYXuBDxUAYRHvj2Y66LxsZRxaHOtKd58vnmqABqrIYBGY+H/NeEYA8LjryYzFVAx
 v+W1+GbqoLcuC5j3j6oEigSEd15UB2SlPdJafMj7H/FzkQbShrNGY/WQUTRXsFxZ
 da1j9QWEtmeP7q54rPVhrgiB1nzM3AOpkoieH936+eiP34cpPw7X48wsmcSE2Cmd
 ZPt36n1qWyVXUwkeUaYO0URDr2NBwWtiyxGEi3vcJBkhgalX59pRdC7xMn7Uf1iL
 xtia0GCiBy7bZoK11N6eUNuo955wVmbq1vjVikOny0p0oy2CwE6bob1NGgvcUghX
 3aeq4jquDg/MdyJ/Catn1orLKHKNHFTmGLq3ijOrCxK48TlgC7t/fMC3f7rFY5Zp
 DVHckTloOYzVa5w8vcFkCtE8UlEoI92SrZ97nEhnFVKLa2rqmIraaI1HOyuf1x3K
 9IkGCt8TZYpn/zLzVO9F/0mgFVkVWI08D52eYZ76yIS/GU4/P/QunNj49X1dF9nu
 e+2TZX3xkKHF3sGTcSuc
 =BudK
 -----END PGP SIGNATURE-----

Merge tag 'renesas-soc-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

Renesas ARM Based SoC Updates for v4.13

* Use GENPD_FLAG_ALWAYS_ON in pm-rmobile

* tag 'renesas-soc-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: pm-rmobile: Use GENPD_FLAG_ALWAYS_ON

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2017-06-18 22:52:14 -07:00
parent 6a5ba7267f fd8cf827d8
commit 516835714a
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/arm/mach-shmobile/pm-rmobile.c
View File

@ -130,7 +130,7 @@ static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd)
struct generic_pm_domain *genpd = &rmobile_pd->genpd;
struct dev_power_governor *gov = rmobile_pd->gov;
genpd->flags = GENPD_FLAG_PM_CLK;
genpd->flags |= GENPD_FLAG_PM_CLK;
genpd->dev_ops.active_wakeup = rmobile_pd_active_wakeup;
genpd->power_off = rmobile_pd_power_down;
genpd->power_on = rmobile_pd_power_up;
@ -140,14 +140,6 @@ static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd)
pm_genpd_init(genpd, gov ? : &simple_qos_governor, false);
}
static int rmobile_pd_suspend_busy(void)
{
/*
* This domain should not be turned off.
*/
return -EBUSY;
}
static int rmobile_pd_suspend_console(void)
{
/*
@ -260,8 +252,7 @@ static void __init rmobile_setup_pm_domain(struct device_node *np,
* only be turned off if the CPU is not in use.
*/
pr_debug("PM domain %s contains CPU\n", name);
pd->gov = &pm_domain_always_on_gov;
pd->suspend = rmobile_pd_suspend_busy;
pd->genpd.flags |= GENPD_FLAG_ALWAYS_ON;
break;
case PD_CONSOLE:
@ -277,8 +268,7 @@ static void __init rmobile_setup_pm_domain(struct device_node *np,
* is not in use.
*/
pr_debug("PM domain %s contains Coresight-ETM\n", name);
pd->gov = &pm_domain_always_on_gov;
pd->suspend = rmobile_pd_suspend_busy;
pd->genpd.flags |= GENPD_FLAG_ALWAYS_ON;
break;
case PD_MEMCTL:
@ -287,8 +277,7 @@ static void __init rmobile_setup_pm_domain(struct device_node *np,
* should only be turned off if memory is not in use.
*/
pr_debug("PM domain %s contains MEMCTL\n", name);
pd->gov = &pm_domain_always_on_gov;
pd->suspend = rmobile_pd_suspend_busy;
pd->genpd.flags |= GENPD_FLAG_ALWAYS_ON;
break;
case PD_NORMAL: