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

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

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



Instead of giving a name to every r8a7740'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 A3SP as a subdomain of A4S.

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

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

+3 −3
Original line number Diff line number Diff line
@@ -607,9 +607,9 @@ enum { 
};



#ifdef CONFIG_PM

extern struct rmobile_pm_domain r8a7740_pd_a4s;

extern struct rmobile_pm_domain r8a7740_pd_a3sp;

extern struct rmobile_pm_domain r8a7740_pd_a4lc;

extern void __init r8a7740_init_pm_domains(void);

#else

static inline void r8a7740_init_pm_domains(void) {}

#endif /* CONFIG_PM */



#endif /* __ASM_R8A7740_H__ */

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

+24 −18
Original line number Diff line number Diff line
@@ -21,14 +21,6 @@ static int r8a7740_pd_a4s_suspend(void) 
	return -EBUSY;

}



struct rmobile_pm_domain r8a7740_pd_a4s = {

	.genpd.name	= "A4S",

	.bit_shift	= 10,

	.gov		= &pm_domain_always_on_gov,

	.no_debug	= true,

	.suspend	= r8a7740_pd_a4s_suspend,

};



static int r8a7740_pd_a3sp_suspend(void)

{

	/*
@@ -38,17 +30,31 @@ static int r8a7740_pd_a3sp_suspend(void) 
	return console_suspend_enabled ? 0 : -EBUSY;

}



struct rmobile_pm_domain r8a7740_pd_a3sp = {

static struct rmobile_pm_domain r8a7740_pm_domains[] = {

	{

		.genpd.name	= "A4S",

		.bit_shift	= 10,

		.gov		= &pm_domain_always_on_gov,

		.no_debug	= true,

		.suspend	= r8a7740_pd_a4s_suspend,

	},

	{

		.genpd.name	= "A3SP",

		.bit_shift	= 11,

		.gov		= &pm_domain_always_on_gov,

		.no_debug	= true,

		.suspend	= r8a7740_pd_a3sp_suspend,

};



struct rmobile_pm_domain r8a7740_pd_a4lc = {

	},

	{

		.genpd.name	= "A4LC",

		.bit_shift	= 1,

	},

};



void __init r8a7740_init_pm_domains(void)

{

	rmobile_init_domains(r8a7740_pm_domains, ARRAY_SIZE(r8a7740_pm_domains));

	pm_genpd_add_subdomain_names("A4S", "A3SP");

}



#endif /* CONFIG_PM */

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

+1 −6
Original line number Diff line number Diff line
@@ -673,12 +673,7 @@ void __init r8a7740_add_standard_devices(void) 
	r8a7740_i2c_workaround(&i2c0_device);

	r8a7740_i2c_workaround(&i2c1_device);



	/* PM domain */

	rmobile_init_pm_domain(&r8a7740_pd_a4s);

	rmobile_init_pm_domain(&r8a7740_pd_a3sp);

	rmobile_init_pm_domain(&r8a7740_pd_a4lc);



	pm_genpd_add_subdomain_names("A4S", "A3SP");

	r8a7740_init_pm_domains();



	/* add devices */

	platform_add_devices(r8a7740_early_devices,