diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2011-09-08 08:15:22 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-13 09:34:57 -0400 |
commit | 06915321e7935d2eb778f0a7f333b2603c1404df (patch) | |
tree | edcab1162a19d1163c00134f2d2c163e71a566ba /arch/arm/mach-omap2/omap-hotplug.c | |
parent | 3695adc2fdaf3ad1881e0dd3e3422e5e141abd7d (diff) |
ARM: SoC: convert OMAP4 to SMP operations
Convert OMAP4 to use struct smp_operations to provide its SMP
and CPU hotplug operations.
Tested on both Panda and IGEPv2 (MULTI_OMAP kernel)
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Reviewed-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/omap-hotplug.c')
-rw-r--r-- | arch/arm/mach-omap2/omap-hotplug.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/arm/mach-omap2/omap-hotplug.c b/arch/arm/mach-omap2/omap-hotplug.c index 414083b427df..2de71a34b691 100644 --- a/arch/arm/mach-omap2/omap-hotplug.c +++ b/arch/arm/mach-omap2/omap-hotplug.c | |||
@@ -26,16 +26,11 @@ | |||
26 | 26 | ||
27 | #include "powerdomain.h" | 27 | #include "powerdomain.h" |
28 | 28 | ||
29 | int platform_cpu_kill(unsigned int cpu) | ||
30 | { | ||
31 | return 1; | ||
32 | } | ||
33 | |||
34 | /* | 29 | /* |
35 | * platform-specific code to shutdown a CPU | 30 | * platform-specific code to shutdown a CPU |
36 | * Called with IRQs disabled | 31 | * Called with IRQs disabled |
37 | */ | 32 | */ |
38 | void __ref platform_cpu_die(unsigned int cpu) | 33 | void __ref omap4_cpu_die(unsigned int cpu) |
39 | { | 34 | { |
40 | unsigned int boot_cpu = 0; | 35 | unsigned int boot_cpu = 0; |
41 | void __iomem *base = omap_get_wakeupgen_base(); | 36 | void __iomem *base = omap_get_wakeupgen_base(); |
@@ -75,12 +70,3 @@ void __ref platform_cpu_die(unsigned int cpu) | |||
75 | pr_debug("CPU%u: spurious wakeup call\n", cpu); | 70 | pr_debug("CPU%u: spurious wakeup call\n", cpu); |
76 | } | 71 | } |
77 | } | 72 | } |
78 | |||
79 | int platform_cpu_disable(unsigned int cpu) | ||
80 | { | ||
81 | /* | ||
82 | * we don't allow CPU 0 to be shutdown (it is still too special | ||
83 | * e.g. clock tick interrupts) | ||
84 | */ | ||
85 | return cpu == 0 ? -EPERM : 0; | ||
86 | } | ||