aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNishanth Menon <nm@ti.com>2011-07-29 21:41:37 -0500
committerZiyann <jaraidaniel@gmail.com>2014-10-01 12:56:18 +0200
commit76ddc1906b821a3e3ae360c2e9a8c3e915bae50f (patch)
tree37b4af0fcd1dc17a42803ef3e11c55d8166f526d
parent67933f5329fb4b4b3529729652bd01419f057bb6 (diff)
downloadkernel_samsung_tuna-76ddc1906b821a3e3ae360c2e9a8c3e915bae50f.tar.gz
kernel_samsung_tuna-76ddc1906b821a3e3ae360c2e9a8c3e915bae50f.tar.bz2
kernel_samsung_tuna-76ddc1906b821a3e3ae360c2e9a8c3e915bae50f.zip
HACK: OMAP2+: Makefile: sequence SR earlier than idle init
SR should be initialized in sequence before idle initialization is done and after pm basic inits are complete. PM initialization unfortunately is not too smart and has to depend on initcall sequencing to ensure proper dependencies are met. instead of fixing the entire PM init sequence(which is possible with function pointers being registered and invoked, but needs an entire revamp of OMAP PM's infrastructure), move SR initialization up in the chain to ensure this works. Change-Id: I643f73168753f618ccac6fd34b135aeb93923637 Signed-off-by: Nishanth Menon <nm@ti.com>
-rw-r--r--arch/arm/mach-omap2/Makefile23
1 files changed, 20 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 61799c9e295..2dc2bbe137d 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -2,6 +2,21 @@
# Makefile for the linux kernel.
#
+# FIXME: For OMAP4 target - the sequence of Obj-files inclusion in
+# Makefile is strictly related to sequence of the Kernel xxx_initcall
+# functions calls. Any changes in the sequence of Obj-files inclusion
+# in this file should be done carefully and can cause unpredictable
+# system behaviour - especially it can have impact on OMAP4 PM
+# initialization procedure.
+#
+# Known valid sequence:
+# - pm.o
+# - sr_device.o
+# - smartreflex.o
+# - smartreflex-class3.o
+# - smartreflex-class1p5.o
+# - pm44xx.o
+
# Common support
obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o \
common.o gpio.o dma.o wd_timer.o omap_pmic.o dmtimer.o
@@ -61,6 +76,11 @@ obj-$(CONFIG_ARCH_OMAP3) += opp3xxx_data.o
obj-$(CONFIG_ARCH_OMAP4) += opp4xxx_data.o
endif
+# Smartreflex AVS initialization
+obj-$(CONFIG_OMAP_SMARTREFLEX) += sr_device.o smartreflex.o
+obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3) += smartreflex-class3.o
+obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS1P5) += smartreflex-class1p5.o
+
# CPUFREQ driver
obj-$(CONFIG_CPU_FREQ) += omap2plus-cpufreq.o
@@ -77,9 +97,6 @@ obj-$(CONFIG_PM_DEBUG) += pm-debug.o
ifeq ($(CONFIG_PM_DEBUG),y)
obj-$(CONFIG_ARCH_OMAP4) += prcm-debug.o
endif
-obj-$(CONFIG_OMAP_SMARTREFLEX) += sr_device.o smartreflex.o
-obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3) += smartreflex-class3.o
-obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS1P5) += smartreflex-class1p5.o
AFLAGS_sleep24xx.o :=-Wa,-march=armv6
AFLAGS_sleep34xx.o :=-Wa,-march=armv7-a$(plus_sec)