diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-08-07 01:07:46 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-09-04 01:44:56 +0200 |
| commit | 8e0e7aaef3c98c52e85f5640b73ffa82058abcfd (patch) | |
| tree | 467ab5ddceb1323ef01f54a411861ad979a0fde1 /arch/arm/mach-shmobile | |
| parent | 8bdd94689ef528738a0f14c44e069596a465d622 (diff) | |
ARM: shmobile: Drop r8a7779_add_device_to_domain()
If the r8a7779's PM domains are given names, this SoC and its boards
will be able to use rmobile_add_device_to_domain() for adding devices
to those domains and r8a7779_add_device_to_domain(), which is not
used anywhere at the moment anyway, may be dopped.
Accordingly, give names to the r8a7779's PM domains and drop
r8a7779_add_device_to_domain().
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Magnus Damm <damm@opensource.se>
Diffstat (limited to 'arch/arm/mach-shmobile')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/r8a7779.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/pm-r8a7779.c | 14 |
2 files changed, 4 insertions, 13 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7779.h b/arch/arm/mach-shmobile/include/mach/r8a7779.h index b07ad318eb2..e0dcef0aa4c 100644 --- a/arch/arm/mach-shmobile/include/mach/r8a7779.h +++ b/arch/arm/mach-shmobile/include/mach/r8a7779.h @@ -353,11 +353,8 @@ 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); -extern void r8a7779_add_device_to_domain(struct r8a7779_pm_domain *r8a7779_pd, - struct platform_device *pdev); #else #define r8a7779_init_pm_domain(pd) do { } while (0) -#define r8a7779_add_device_to_domain(pd, pdev) do { } while (0) #endif /* CONFIG_PM */ #endif /* __ASM_R8A7779_H__ */ diff --git a/arch/arm/mach-shmobile/pm-r8a7779.c b/arch/arm/mach-shmobile/pm-r8a7779.c index a18a4ae16d2..b2a98cca66d 100644 --- a/arch/arm/mach-shmobile/pm-r8a7779.c +++ b/arch/arm/mach-shmobile/pm-r8a7779.c @@ -199,17 +199,8 @@ void r8a7779_init_pm_domain(struct r8a7779_pm_domain *r8a7779_pd) pd_power_up(&r8a7779_pd->genpd); } -void r8a7779_add_device_to_domain(struct r8a7779_pm_domain *r8a7779_pd, - struct platform_device *pdev) -{ - struct device *dev = &pdev->dev; - - pm_genpd_add_device(&r8a7779_pd->genpd, dev); - if (pm_clk_no_clocks(dev)) - pm_clk_add(dev, NULL); -} - struct r8a7779_pm_domain r8a7779_sh4a = { + .genpd.name = "SH4A", .ch = { .chan_offs = 0x80, /* PWRSR1 .. PWRER1 */ .isr_bit = 16, /* SH4A */ @@ -217,6 +208,7 @@ struct r8a7779_pm_domain r8a7779_sh4a = { }; struct r8a7779_pm_domain r8a7779_sgx = { + .genpd.name = "SGX", .ch = { .chan_offs = 0xc0, /* PWRSR2 .. PWRER2 */ .isr_bit = 20, /* SGX */ @@ -224,6 +216,7 @@ struct r8a7779_pm_domain r8a7779_sgx = { }; struct r8a7779_pm_domain r8a7779_vdp1 = { + .genpd.name = "VDP1", .ch = { .chan_offs = 0x100, /* PWRSR3 .. PWRER3 */ .isr_bit = 21, /* VDP */ @@ -231,6 +224,7 @@ struct r8a7779_pm_domain r8a7779_vdp1 = { }; struct r8a7779_pm_domain r8a7779_impx3 = { + .genpd.name = "IMPX3", .ch = { .chan_offs = 0x140, /* PWRSR4 .. PWRER4 */ .isr_bit = 24, /* IMP */ |