Commit b46355a9 authored by Nishanth Menon's avatar Nishanth Menon Committed by Tony Lindgren

ARM: OMAP4: sleep: build OMAP4 specific functions only for OMAP4

CPU sleep and resume functions for Cortex-A9 based OMAP4 and
Cortex-A15 based OMAP5 are different. Hence, even though we reuse
most of the remaining file as part of OMAP4/5 consolidation, build
OMAP4 specific sleep/resume operations only for OMAP4. SCU is not used
OMAP5.

This fixes the following build failure with OMAP5 only build:
arch/arm/mach-omap2/built-in.o: In function `scu_gp_set':
arch/arm/mach-omap2/sleep44xx.S:132: undefined reference to `scu_power_mode'
arch/arm/mach-omap2/built-in.o: In function `scu_gp_clear':
arch/arm/mach-omap2/sleep44xx.S:229: undefined reference to `scu_power_mode'
Reported-by: default avatarPekon Gupta <pekon@ti.com>
Reported-by: default avatarVincent Stehlé <v-stehle@ti.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: default avatarNishanth Menon <nm@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 37bd6ca8
...@@ -34,6 +34,8 @@ ppa_zero_params: ...@@ -34,6 +34,8 @@ ppa_zero_params:
ppa_por_params: ppa_por_params:
.word 1, 0 .word 1, 0
#ifdef CONFIG_ARCH_OMAP4
/* /*
* ============================= * =============================
* == CPU suspend finisher == * == CPU suspend finisher ==
...@@ -326,7 +328,9 @@ skip_l2en: ...@@ -326,7 +328,9 @@ skip_l2en:
b cpu_resume @ Jump to generic resume b cpu_resume @ Jump to generic resume
ENDPROC(omap4_cpu_resume) ENDPROC(omap4_cpu_resume)
#endif #endif /* CONFIG_ARCH_OMAP4 */
#endif /* defined(CONFIG_SMP) && defined(CONFIG_PM) */
#ifndef CONFIG_OMAP4_ERRATA_I688 #ifndef CONFIG_OMAP4_ERRATA_I688
ENTRY(omap_bus_sync) ENTRY(omap_bus_sync)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment