Commit b46355a9 authored Jun 26, 2013 by Nishanth Menon Committed by Tony Lindgren Jul 04, 2013

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: Pekon Gupta <pekon@ti.com>
Reported-by: Vincent Stehlé <v-stehle@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

parent 37bd6ca8

arch/arm/mach-omap2/sleep44xx.S

+5 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,8 @@ ppa_zero_params:
		ppa_por_params:
		.word 1, 0

		#ifdef CONFIG_ARCH_OMAP4

		/*
		* =============================
		* == CPU suspend finisher ==
		@@ -326,7 +328,9 @@ skip_l2en:

		b cpu_resume @ Jump to generic resume
		ENDPROC(omap4_cpu_resume)
		#endif
		#endif /* CONFIG_ARCH_OMAP4 */

		#endif /* defined(CONFIG_SMP) && defined(CONFIG_PM) */

		#ifndef CONFIG_OMAP4_ERRATA_I688
		ENTRY(omap_bus_sync)