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

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

ARM: shmobile: Move sh7372's PM domain objects to a table 



Instead of giving a name to every sh7372's PM domain object, put them
all into a table and use rmobile_init_domains(), introduced by a
previous patch, for initializing them all altogether.  Also, use
pm_genpd_add_subdomain_names() for adding subdomains to the PM
domains and pm_genpd_poweron_name() for turning on the A4S domain
when preparing for system suspend.

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

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

+6 −12
Original line number Diff line number Diff line
@@ -478,21 +478,15 @@ extern struct clk sh7372_fsibck_clk; 
extern struct clk sh7372_fsidiva_clk;

extern struct clk sh7372_fsidivb_clk;



#ifdef CONFIG_PM

extern struct rmobile_pm_domain sh7372_pd_a4lc;

extern struct rmobile_pm_domain sh7372_pd_a4mp;

extern struct rmobile_pm_domain sh7372_pd_d4;

extern struct rmobile_pm_domain sh7372_pd_a4r;

extern struct rmobile_pm_domain sh7372_pd_a3rv;

extern struct rmobile_pm_domain sh7372_pd_a3ri;

extern struct rmobile_pm_domain sh7372_pd_a4s;

extern struct rmobile_pm_domain sh7372_pd_a3sp;

extern struct rmobile_pm_domain sh7372_pd_a3sg;

#endif /* CONFIG_PM */



extern void sh7372_intcs_suspend(void);

extern void sh7372_intcs_resume(void);

extern void sh7372_intca_suspend(void);

extern void sh7372_intca_resume(void);



#ifdef CONFIG_PM

extern void __init sh7372_init_pm_domains(void);

#else

static inline void sh7372_init_pm_domains(void) {}

#endif



#endif /* __ASM_SH7372_H__ */

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

+57 −54
Original line number Diff line number Diff line
@@ -71,21 +71,6 @@ 


#ifdef CONFIG_PM



struct rmobile_pm_domain sh7372_pd_a4lc = {

	.genpd.name = "A4LC",

	.bit_shift = 1,

};



struct rmobile_pm_domain sh7372_pd_a4mp = {

	.genpd.name = "A4MP",

	.bit_shift = 2,

};



struct rmobile_pm_domain sh7372_pd_d4 = {

	.genpd.name = "D4",

	.bit_shift = 3,

};



static int sh7372_a4r_pd_suspend(void)

{

	sh7372_intcs_suspend();
@@ -93,26 +78,9 @@ static int sh7372_a4r_pd_suspend(void) 
	return 0;

}



struct rmobile_pm_domain sh7372_pd_a4r = {

	.genpd.name = "A4R",

	.bit_shift = 5,

	.suspend = sh7372_a4r_pd_suspend,

	.resume = sh7372_intcs_resume,

};



struct rmobile_pm_domain sh7372_pd_a3rv = {

	.genpd.name = "A3RV",

	.bit_shift = 6,

};



struct rmobile_pm_domain sh7372_pd_a3ri = {

	.genpd.name = "A3RI",

	.bit_shift = 8,

};



static bool a4s_suspend_ready;



static int sh7372_pd_a4s_suspend(void)

static int sh7372_a4s_pd_suspend(void)

{

	/*

	 * The A4S domain contains the CPU core and therefore it should
@@ -125,20 +93,11 @@ static int sh7372_pd_a4s_suspend(void) 
	return -EBUSY;

}



static void sh7372_pd_a4s_resume(void)

static void sh7372_a4s_pd_resume(void)

{

	a4s_suspend_ready = false;

}



struct rmobile_pm_domain sh7372_pd_a4s = {

	.genpd.name = "A4S",

	.bit_shift = 10,

	.gov = &pm_domain_always_on_gov,

	.no_debug = true,

	.suspend = sh7372_pd_a4s_suspend,

	.resume = sh7372_pd_a4s_resume,

};



static int sh7372_a3sp_pd_suspend(void)

{

	/*
@@ -148,19 +107,63 @@ static int sh7372_a3sp_pd_suspend(void) 
	return console_suspend_enabled ? 0 : -EBUSY;

}



struct rmobile_pm_domain sh7372_pd_a3sp = {

static struct rmobile_pm_domain sh7372_pm_domains[] = {

	{

		.genpd.name = "A4LC",

		.bit_shift = 1,

	},

	{

		.genpd.name = "A4MP",

		.bit_shift = 2,

	},

	{

		.genpd.name = "D4",

		.bit_shift = 3,

	},

	{

		.genpd.name = "A4R",

		.bit_shift = 5,

		.suspend = sh7372_a4r_pd_suspend,

		.resume = sh7372_intcs_resume,

	},

	{

		.genpd.name = "A3RV",

		.bit_shift = 6,

	},

	{

		.genpd.name = "A3RI",

		.bit_shift = 8,

	},

	{

		.genpd.name = "A4S",

		.bit_shift = 10,

		.gov = &pm_domain_always_on_gov,

		.no_debug = true,

		.suspend = sh7372_a4s_pd_suspend,

		.resume = sh7372_a4s_pd_resume,

	},

	{

		.genpd.name = "A3SP",

		.bit_shift = 11,

		.gov = &pm_domain_always_on_gov,

		.no_debug = true,

		.suspend = sh7372_a3sp_pd_suspend,

};



struct rmobile_pm_domain sh7372_pd_a3sg = {

	},

	{

		.genpd.name = "A3SG",

		.bit_shift = 13,

	},

};



void __init sh7372_init_pm_domains(void)

{

	rmobile_init_domains(sh7372_pm_domains, ARRAY_SIZE(sh7372_pm_domains));

	pm_genpd_add_subdomain_names("A4LC", "A3RV");

	pm_genpd_add_subdomain_names("A4R", "A4LC");

	pm_genpd_add_subdomain_names("A4S", "A3SG");

	pm_genpd_add_subdomain_names("A4S", "A3SP");

}



#endif /* CONFIG_PM */



#if defined(CONFIG_SUSPEND) || defined(CONFIG_CPU_IDLE)
@@ -436,7 +439,7 @@ static int sh7372_pm_notifier_fn(struct notifier_block *notifier, 
		 * executed during system suspend and resume, respectively, so

		 * that those functions don't crash while accessing the INTCS.

		 */

		pm_genpd_poweron(&sh7372_pd_a4r.genpd);

		pm_genpd_name_poweron("A4R");

		break;

	case PM_POST_SUSPEND:

		pm_genpd_poweroff_unused();

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

+1 −15
Original line number Diff line number Diff line
@@ -1001,21 +1001,7 @@ static struct platform_device *sh7372_late_devices[] __initdata = { 


void __init sh7372_add_standard_devices(void)

{

	rmobile_init_pm_domain(&sh7372_pd_a4lc);

	rmobile_init_pm_domain(&sh7372_pd_a4mp);

	rmobile_init_pm_domain(&sh7372_pd_d4);

	rmobile_init_pm_domain(&sh7372_pd_a4r);

	rmobile_init_pm_domain(&sh7372_pd_a3rv);

	rmobile_init_pm_domain(&sh7372_pd_a3ri);

	rmobile_init_pm_domain(&sh7372_pd_a4s);

	rmobile_init_pm_domain(&sh7372_pd_a3sp);

	rmobile_init_pm_domain(&sh7372_pd_a3sg);



	pm_genpd_add_subdomain_names("A4LC", "A3RV");

	pm_genpd_add_subdomain_names("A4R", "A4LC");



	pm_genpd_add_subdomain_names("A4S", "A3SG");

	pm_genpd_add_subdomain_names("A4S", "A3SP");

	sh7372_init_pm_domains();



	platform_add_devices(sh7372_early_devices,

			    ARRAY_SIZE(sh7372_early_devices));