diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2012-01-12 12:20:18 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-12 12:20:18 +0900 |
| commit | e64e1b11b14d363ac70fd13ab809969a6d7e42a8 (patch) | |
| tree | 809dd1350f39b795e9bbce21db18d521e7844533 /arch/arm/mach-shmobile/include/mach | |
| parent | arm: mach-shmobile: add a resource name for shdma (diff) | |
| parent | ARM: mach-shmobile: r8a7779 SMP support V3 (diff) | |
| download | linux-dev-e64e1b11b14d363ac70fd13ab809969a6d7e42a8.tar.xz linux-dev-e64e1b11b14d363ac70fd13ab809969a6d7e42a8.zip | |
Merge branch 'rmobile/smp' into rmobile-latest
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/common.h | 6 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/r8a7779.h | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h index 44ce124bfdec..e4b945e271e7 100644 --- a/arch/arm/mach-shmobile/include/mach/common.h +++ b/arch/arm/mach-shmobile/include/mach/common.h @@ -68,4 +68,10 @@ extern void r8a7779_clock_init(void); extern void r8a7779_pinmux_init(void); extern void r8a7779_pm_init(void); +extern unsigned int r8a7779_get_core_count(void); +extern int r8a7779_platform_cpu_kill(unsigned int cpu); +extern void r8a7779_secondary_init(unsigned int cpu); +extern int r8a7779_boot_secondary(unsigned int cpu); +extern void r8a7779_smp_prepare_cpus(void); + #endif /* __ARCH_MACH_COMMON_H */ diff --git a/arch/arm/mach-shmobile/include/mach/r8a7779.h b/arch/arm/mach-shmobile/include/mach/r8a7779.h index e6a6166fdf22..b07ad318eb2e 100644 --- a/arch/arm/mach-shmobile/include/mach/r8a7779.h +++ b/arch/arm/mach-shmobile/include/mach/r8a7779.h @@ -343,6 +343,9 @@ static inline struct r8a7779_pm_ch *to_r8a7779_ch(struct generic_pm_domain *d) return &container_of(d, struct r8a7779_pm_domain, genpd)->ch; } +extern int r8a7779_sysc_power_down(struct r8a7779_pm_ch *r8a7779_ch); +extern int r8a7779_sysc_power_up(struct r8a7779_pm_ch *r8a7779_ch); + #ifdef CONFIG_PM extern struct r8a7779_pm_domain r8a7779_sh4a; extern struct r8a7779_pm_domain r8a7779_sgx; |