evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Magnus Damm <damm@opensource.se>
This commit is contained in:
Rafael J. Wysocki 2012-08-07 01:13:37 +02:00
parent e7e59a4b55
commit 7b5674075b
3 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/mach-shmobile/include/mach/r8a7740.h
View file

@ -607,9 +607,9 @@ enum {
}; };
#ifdef CONFIG_PM #ifdef CONFIG_PM
extern struct rmobile_pm_domain r8a7740_pd_a4s; extern void __init r8a7740_init_pm_domains(void);
extern struct rmobile_pm_domain r8a7740_pd_a3sp; #else
extern struct rmobile_pm_domain r8a7740_pd_a4lc; static inline void r8a7740_init_pm_domains(void) {}
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
#endif /* __ASM_R8A7740_H__ */ #endif /* __ASM_R8A7740_H__ */

42
arch/arm/mach-shmobile/pm-r8a7740.c
View file

@ -21,14 +21,6 @@ static int r8a7740_pd_a4s_suspend(void)
return -EBUSY; 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) static int r8a7740_pd_a3sp_suspend(void)
{ {
/* /*
@ -38,17 +30,31 @@ static int r8a7740_pd_a3sp_suspend(void)
return console_suspend_enabled ? 0 : -EBUSY; return console_suspend_enabled ? 0 : -EBUSY;
} }
struct rmobile_pm_domain r8a7740_pd_a3sp = { static struct rmobile_pm_domain r8a7740_pm_domains[] = {
.genpd.name = "A3SP", {
.bit_shift = 11, .genpd.name = "A4S",
.gov = &pm_domain_always_on_gov, .bit_shift = 10,
.no_debug = true, .gov = &pm_domain_always_on_gov,
.suspend = r8a7740_pd_a3sp_suspend, .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,
},
{
.genpd.name = "A4LC",
.bit_shift = 1,
},
}; };
struct rmobile_pm_domain r8a7740_pd_a4lc = { void __init r8a7740_init_pm_domains(void)
.genpd.name = "A4LC", {
.bit_shift = 1, rmobile_init_domains(r8a7740_pm_domains, ARRAY_SIZE(r8a7740_pm_domains));
}; pm_genpd_add_subdomain_names("A4S", "A3SP");
}
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */

7
arch/arm/mach-shmobile/setup-r8a7740.c
View file

@ -673,12 +673,7 @@ void __init r8a7740_add_standard_devices(void)
r8a7740_i2c_workaround(&i2c0_device); r8a7740_i2c_workaround(&i2c0_device);
r8a7740_i2c_workaround(&i2c1_device); r8a7740_i2c_workaround(&i2c1_device);
/* PM domain */ r8a7740_init_pm_domains();
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");
/* add devices */ /* add devices */
platform_add_devices(r8a7740_early_devices, platform_add_devices(r8a7740_early_devices,