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

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

Browse source 
Instead of giving a name to every r8a7779's PM domain object, put
them all into a table and initialize them all together in a loop.

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:14:14 +02:00
parent 7b5674075b
commit 45e5ca5756
3 changed files with 39 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/arm/mach-shmobile/include/mach/r8a7779.h
View file

@ -347,14 +347,9 @@ extern int r8a7779_sysc_power_down(struct r8a7779_pm_ch *r8a7779_ch);
extern int r8a7779_sysc_power_up(struct r8a7779_pm_ch *r8a7779_ch); extern int r8a7779_sysc_power_up(struct r8a7779_pm_ch *r8a7779_ch);
#ifdef CONFIG_PM #ifdef CONFIG_PM
extern struct r8a7779_pm_domain r8a7779_sh4a; extern void __init r8a7779_init_pm_domains(void);
extern struct r8a7779_pm_domain r8a7779_sgx;
extern struct r8a7779_pm_domain r8a7779_vdp1;
extern struct r8a7779_pm_domain r8a7779_impx3;
extern void r8a7779_init_pm_domain(struct r8a7779_pm_domain *r8a7779_pd);
#else #else
#define r8a7779_init_pm_domain(pd) do { } while (0) static inline void r8a7779_init_pm_domains(void) {}
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
#endif /* __ASM_R8A7779_H__ */ #endif /* __ASM_R8A7779_H__ */

37
arch/arm/mach-shmobile/pm-r8a7779.c
View file

@ -183,7 +183,7 @@ static bool pd_active_wakeup(struct device *dev)
return true; return true;
} }
void r8a7779_init_pm_domain(struct r8a7779_pm_domain *r8a7779_pd) static void r8a7779_init_pm_domain(struct r8a7779_pm_domain *r8a7779_pd)
{ {
struct generic_pm_domain *genpd = &r8a7779_pd->genpd; struct generic_pm_domain *genpd = &r8a7779_pd->genpd;
@ -199,38 +199,45 @@ void r8a7779_init_pm_domain(struct r8a7779_pm_domain *r8a7779_pd)
pd_power_up(&r8a7779_pd->genpd); pd_power_up(&r8a7779_pd->genpd);
} }
struct r8a7779_pm_domain r8a7779_sh4a = { static struct r8a7779_pm_domain r8a7779_pm_domains[] = {
{
.genpd.name = "SH4A", .genpd.name = "SH4A",
.ch = { .ch = {
.chan_offs = 0x80, /* PWRSR1 .. PWRER1 */ .chan_offs = 0x80, /* PWRSR1 .. PWRER1 */
.isr_bit = 16, /* SH4A */ .isr_bit = 16, /* SH4A */
} },
}; },
{
struct r8a7779_pm_domain r8a7779_sgx = {
.genpd.name = "SGX", .genpd.name = "SGX",
.ch = { .ch = {
.chan_offs = 0xc0, /* PWRSR2 .. PWRER2 */ .chan_offs = 0xc0, /* PWRSR2 .. PWRER2 */
.isr_bit = 20, /* SGX */ .isr_bit = 20, /* SGX */
} },
}; },
{
struct r8a7779_pm_domain r8a7779_vdp1 = {
.genpd.name = "VDP1", .genpd.name = "VDP1",
.ch = { .ch = {
.chan_offs = 0x100, /* PWRSR3 .. PWRER3 */ .chan_offs = 0x100, /* PWRSR3 .. PWRER3 */
.isr_bit = 21, /* VDP */ .isr_bit = 21, /* VDP */
} },
}; },
{
struct r8a7779_pm_domain r8a7779_impx3 = {
.genpd.name = "IMPX3", .genpd.name = "IMPX3",
.ch = { .ch = {
.chan_offs = 0x140, /* PWRSR4 .. PWRER4 */ .chan_offs = 0x140, /* PWRSR4 .. PWRER4 */
.isr_bit = 24, /* IMP */ .isr_bit = 24, /* IMP */
} },
},
}; };
void __init r8a7779_init_pm_domains(void)
{
int j;
for (j = 0; j < ARRAY_SIZE(r8a7779_pm_domains); j++)
r8a7779_init_pm_domain(&r8a7779_pm_domains[j]);
}
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
void __init r8a7779_pm_init(void) void __init r8a7779_pm_init(void)

5
arch/arm/mach-shmobile/setup-r8a7779.c
View file

@ -251,10 +251,7 @@ void __init r8a7779_add_standard_devices(void)
#endif #endif
r8a7779_pm_init(); r8a7779_pm_init();
r8a7779_init_pm_domain(&r8a7779_sh4a); r8a7779_init_pm_domains();
r8a7779_init_pm_domain(&r8a7779_sgx);
r8a7779_init_pm_domain(&r8a7779_vdp1);
r8a7779_init_pm_domain(&r8a7779_impx3);
platform_add_devices(r8a7779_early_devices, platform_add_devices(r8a7779_early_devices,
ARRAY_SIZE(r8a7779_early_devices)); ARRAY_SIZE(r8a7779_early_devices));