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

Commit 980532a5 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Simon Horman
Browse files

soc: renesas: rcar-sysc: Use GENPD_FLAG_ALWAYS_ON 



Improve handling of always-on PM domains by using the
GENPD_FLAG_ALWAYS_ON flag introduced in commit ffaa42e8 ("PM /
Domains: Enable users of genpd to specify always on PM domains").

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 2ea659a9

drivers/soc/renesas/rcar-sysc.c

+4 −24
Original line number Diff line number Diff line
@@ -181,17 +181,6 @@ static int rcar_sysc_pd_power_off(struct generic_pm_domain *genpd) 
	struct rcar_sysc_pd *pd = to_rcar_pd(genpd);



	pr_debug("%s: %s\n", __func__, genpd->name);



	if (pd->flags & PD_NO_CR) {

		pr_debug("%s: Cannot control %s\n", __func__, genpd->name);

		return -EBUSY;

	}



	if (pd->flags & PD_BUSY) {

		pr_debug("%s: %s busy\n", __func__, genpd->name);

		return -EBUSY;

	}



	return rcar_sysc_power_down(&pd->ch);

}
@@ -200,12 +189,6 @@ static int rcar_sysc_pd_power_on(struct generic_pm_domain *genpd) 
	struct rcar_sysc_pd *pd = to_rcar_pd(genpd);



	pr_debug("%s: %s\n", __func__, genpd->name);



	if (pd->flags & PD_NO_CR) {

		pr_debug("%s: Cannot control %s\n", __func__, genpd->name);

		return 0;

	}



	return rcar_sysc_power_up(&pd->ch);

}
@@ -223,8 +206,7 @@ static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd) 
		 * only be turned off if the CPU is not in use.

		 */

		pr_debug("PM domain %s contains %s\n", name, "CPU");

		pd->flags |= PD_BUSY;

		gov = &pm_domain_always_on_gov;

		genpd->flags |= GENPD_FLAG_ALWAYS_ON;

	} else if (pd->flags & PD_SCU) {

		/*

		 * This domain contains an SCU and cache-controller, and
@@ -232,19 +214,17 @@ static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd) 
		 * not in use.

		 */

		pr_debug("PM domain %s contains %s\n", name, "SCU");

		pd->flags |= PD_BUSY;

		gov = &pm_domain_always_on_gov;

		genpd->flags |= GENPD_FLAG_ALWAYS_ON;

	} else if (pd->flags & PD_NO_CR) {

		/*

		 * This domain cannot be turned off.

		 */

		pd->flags |= PD_BUSY;

		gov = &pm_domain_always_on_gov;

		genpd->flags |= GENPD_FLAG_ALWAYS_ON;

	}



	if (!(pd->flags & (PD_CPU | PD_SCU))) {

		/* Enable Clock Domain for I/O devices */

		genpd->flags = GENPD_FLAG_PM_CLK;

		genpd->flags |= GENPD_FLAG_PM_CLK;

		if (has_cpg_mstp) {

			genpd->attach_dev = cpg_mstp_attach_dev;

			genpd->detach_dev = cpg_mstp_detach_dev;

drivers/soc/renesas/rcar-sysc.h

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
#define PD_SCU		BIT(1)	/* Area contains SCU and L2 cache */

#define PD_NO_CR	BIT(2)	/* Area lacks PWR{ON,OFF}CR registers */



#define PD_BUSY		BIT(3)	/* Busy, for internal use only */



#define PD_CPU_CR	PD_CPU		  /* CPU area has CR (R-Car H1) */

#define PD_CPU_NOCR	PD_CPU | PD_NO_CR /* CPU area lacks CR (R-Car Gen2/3) */

#define PD_ALWAYS_ON	PD_NO_CR	  /* Always-on area */