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

Commit 111058c3 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ARM / shmobile: Make A3RV be a subdomain of A4LC on SH7372 



Instead of coding the undocumented dependencies between power domains
A3RV and A4LC on SH7372 directly into the low-level power up/down
routines, make A3RV be a subdomain of A4LC, which will cause the
same dependecies to hold.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarMagnus Damm <damm@opensource.se>
parent bc0403ff

arch/arm/mach-shmobile/include/mach/sh7372.h

+3 −0
Original line number Diff line number Diff line
@@ -494,9 +494,12 @@ extern struct sh7372_pm_domain sh7372_a3sg; 
extern void sh7372_init_pm_domain(struct sh7372_pm_domain *sh7372_pd);

extern void sh7372_add_device_to_domain(struct sh7372_pm_domain *sh7372_pd,

					struct platform_device *pdev);

extern void sh7372_pm_add_subdomain(struct sh7372_pm_domain *sh7372_pd,

				    struct sh7372_pm_domain *sh7372_sd);

#else

#define sh7372_init_pm_domain(pd) do { } while(0)

#define sh7372_add_device_to_domain(pd, pdev) do { } while(0)

#define sh7372_pm_add_subdomain(pd, sd) do { } while(0)

#endif /* CONFIG_PM */



#endif /* __ASM_SH7372_H__ */

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

+8 −40
Original line number Diff line number Diff line
@@ -91,35 +91,6 @@ static int pd_power_up(struct generic_pm_domain *genpd) 
	return ret;

}



static int pd_power_up_a3rv(struct generic_pm_domain *genpd)

{

	int ret = pd_power_up(genpd);



	/* force A4LC on after A3RV has been requested on */

	pm_genpd_poweron(&sh7372_a4lc.genpd);



	return ret;

}



static int pd_power_down_a3rv(struct generic_pm_domain *genpd)

{

	int ret = pd_power_down(genpd);



	/* try to power down A4LC after A3RV is requested off */

	genpd_queue_power_off_work(&sh7372_a4lc.genpd);



	return ret;

}



static int pd_power_down_a4lc(struct generic_pm_domain *genpd)

{

	/* only power down A4LC if A3RV is off */

	if (!(__raw_readl(PSTR) & (1 << sh7372_a3rv.bit_shift)))

		return pd_power_down(genpd);



	return -EBUSY;

}



static bool pd_active_wakeup(struct device *dev)

{

	return true;
@@ -133,17 +104,8 @@ void sh7372_init_pm_domain(struct sh7372_pm_domain *sh7372_pd) 
	genpd->stop_device = pm_clk_suspend;

	genpd->start_device = pm_clk_resume;

	genpd->active_wakeup = pd_active_wakeup;



	if (sh7372_pd == &sh7372_a4lc) {

		genpd->power_off = pd_power_down_a4lc;

		genpd->power_on = pd_power_up;

	} else if (sh7372_pd == &sh7372_a3rv) {

		genpd->power_off = pd_power_down_a3rv;

		genpd->power_on = pd_power_up_a3rv;

	} else {

	genpd->power_off = pd_power_down;

	genpd->power_on = pd_power_up;

	}

	genpd->power_on(&sh7372_pd->genpd);

}
@@ -159,6 +121,12 @@ void sh7372_add_device_to_domain(struct sh7372_pm_domain *sh7372_pd, 
	pm_genpd_add_device(&sh7372_pd->genpd, dev);

}



void sh7372_pm_add_subdomain(struct sh7372_pm_domain *sh7372_pd,

			     struct sh7372_pm_domain *sh7372_sd)

{

	pm_genpd_add_subdomain(&sh7372_pd->genpd, &sh7372_sd->genpd);

}



struct sh7372_pm_domain sh7372_a4lc = {

	.bit_shift = 1,

};

arch/arm/mach-shmobile/setup-sh7372.c

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/sh_dma.h>

#include <linux/sh_intc.h>

#include <linux/sh_timer.h>

#include <linux/pm_domain.h>

#include <mach/hardware.h>

#include <mach/sh7372.h>

#include <asm/mach-types.h>
@@ -848,6 +849,8 @@ void __init sh7372_add_standard_devices(void) 
	sh7372_init_pm_domain(&sh7372_a3ri);

	sh7372_init_pm_domain(&sh7372_a3sg);



	sh7372_pm_add_subdomain(&sh7372_a4lc, &sh7372_a3rv);



	platform_add_devices(sh7372_early_devices,

			    ARRAY_SIZE(sh7372_early_devices));