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

Commit 51683571 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-soc-for-v4.13' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 6a5ba726 fd8cf827

arch/arm/mach-shmobile/pm-rmobile.c

+4 −15
Original line number Diff line number Diff line
@@ -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: