diff options
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap-smp.c | 3 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/smp.h | 7 |
3 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 63b2d8859c3c..88d3a1e920f5 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
| @@ -25,6 +25,7 @@ obj-$(CONFIG_LOCAL_TIMERS) += timer-mpu.o | |||
| 25 | obj-$(CONFIG_HOTPLUG_CPU) += omap-hotplug.o | 25 | obj-$(CONFIG_HOTPLUG_CPU) += omap-hotplug.o |
| 26 | obj-$(CONFIG_ARCH_OMAP4) += omap44xx-smc.o omap4-common.o | 26 | obj-$(CONFIG_ARCH_OMAP4) += omap44xx-smc.o omap4-common.o |
| 27 | 27 | ||
| 28 | AFLAGS_omap-headsmp.o :=-Wa,-march=armv7-a | ||
| 28 | AFLAGS_omap44xx-smc.o :=-Wa,-march=armv7-a | 29 | AFLAGS_omap44xx-smc.o :=-Wa,-march=armv7-a |
| 29 | 30 | ||
| 30 | # Functions loaded to SRAM | 31 | # Functions loaded to SRAM |
diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c index af3c20c8d3f9..9e9f70e18e3c 100644 --- a/arch/arm/mach-omap2/omap-smp.c +++ b/arch/arm/mach-omap2/omap-smp.c | |||
| @@ -102,8 +102,7 @@ static void __init wakeup_secondary(void) | |||
| 102 | * Send a 'sev' to wake the secondary core from WFE. | 102 | * Send a 'sev' to wake the secondary core from WFE. |
| 103 | * Drain the outstanding writes to memory | 103 | * Drain the outstanding writes to memory |
| 104 | */ | 104 | */ |
| 105 | dsb(); | 105 | dsb_sev(); |
| 106 | set_event(); | ||
| 107 | mb(); | 106 | mb(); |
| 108 | } | 107 | } |
| 109 | 108 | ||
diff --git a/arch/arm/plat-omap/include/plat/smp.h b/arch/arm/plat-omap/include/plat/smp.h index 6a3ff65c0303..5177a9c5a25a 100644 --- a/arch/arm/plat-omap/include/plat/smp.h +++ b/arch/arm/plat-omap/include/plat/smp.h | |||
| @@ -19,13 +19,6 @@ | |||
| 19 | 19 | ||
| 20 | #include <asm/hardware/gic.h> | 20 | #include <asm/hardware/gic.h> |
| 21 | 21 | ||
| 22 | /* | ||
| 23 | * set_event() is used to wake up secondary core from wfe using sev. ROM | ||
| 24 | * code puts the second core into wfe(standby). | ||
| 25 | * | ||
| 26 | */ | ||
| 27 | #define set_event() __asm__ __volatile__ ("sev" : : : "memory") | ||
| 28 | |||
| 29 | /* Needed for secondary core boot */ | 22 | /* Needed for secondary core boot */ |
| 30 | extern void omap_secondary_startup(void); | 23 | extern void omap_secondary_startup(void); |
| 31 | extern u32 omap_modify_auxcoreboot0(u32 set_mask, u32 clear_mask); | 24 | extern u32 omap_modify_auxcoreboot0(u32 set_mask, u32 clear_mask); |
