aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/Makefile
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2008-10-06 08:49:15 -0400
committerTony Lindgren <tony@atomide.com>2008-10-06 08:49:15 -0400
commit1835f1d720786138c43147448f4527dd380c1e33 (patch)
tree4b37f611a33d69a6a479d181b06b2ed617e7280d /arch/arm/mach-omap2/Makefile
parent6e81176dc8b7ec20da9f48b9be076e83f5d7d2ec (diff)
ARM: OMAP2: Move sleep.S into sleep24xx.S
Some register offsets are different for 242x and 243x. This will allow compiling sleep code for both chips into the same kernel. Pass the addresses for SDRC_DDLA_CTRL and SDRC_POWER to the omap24xx_cpu_suspend instead of loading the values since the only. Also fix a bug to call omap2_sram_suspend with the value of SDRC_DLLA_CTRL instead of the address as that's what omap24xx_cpu_suspend expects to determine between DDR and SDR. This bug has not been noticed as the boards seem to have DDR instead of SDR. Note that some PM patches are still missing. The PM patches will be added later on once the base files are in sync with linux-omap tree. Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
-rw-r--r--arch/arm/mach-omap2/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index e7cf1b4357ce..800639e7c6a4 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -14,7 +14,10 @@ obj-$(CONFIG_ARCH_OMAP2420) += sram242x.o
14obj-$(CONFIG_ARCH_OMAP2430) += sram243x.o 14obj-$(CONFIG_ARCH_OMAP2430) += sram243x.o
15 15
16# Power Management 16# Power Management
17obj-$(CONFIG_PM) += pm.o sleep.o 17ifeq ($(CONFIG_PM),y)
18obj-y += pm.o
19obj-$(CONFIG_ARCH_OMAP24XX) += sleep24xx.o
20endif
18 21
19# Clock framework 22# Clock framework
20obj-$(CONFIG_ARCH_OMAP2) += clock24xx.o 23obj-$(CONFIG_ARCH_OMAP2) += clock24xx.o