ARM: pm: omap34xx: remove get_*_restore_pointer functions, directly use entry points
authorKevin Hilman <khilman@ti.com>
Fri, 24 Jun 2011 00:16:14 +0000 (17:16 -0700)
committerJason Kridner <jdk@ti.com>
Sat, 17 Sep 2011 13:14:10 +0000 (09:14 -0400)
commitcdaaf305be8d8269c7085ee96bea4e9eb0955495
tree63a92e444884f7bdd371e2baf618f0ae17174d86
parent3d964593635fa4fb62fdd6793c475d19d72a9bd2
ARM: pm: omap34xx: remove get_*_restore_pointer functions, directly use entry points

Upon return from off-mode, the ROM code jumps to a restore function
saved in the scratchpad.  Based on SoC revision or errata, this
restore entry point is different.  Current code uses some helper
functions in sleep34xx.S (get_*_restore_pointer) to get the restore
function entry point.

When returning from off-mode, this code is executed from SDRAM, so
there's no reason to use these helper functions when using the SDRAM
entry points directly would work just fine.

This patch uses ENTRY/ENDPROC to create "real" entry points for these
functions, and uses those values directly when writing the scratchpad.

Tested all three entry points
- restore_es3: 3430/n900
- restore_3630: 3630/Zoom3
- restore: 3530/Overo

Suggested-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Jean Pihet <j-pihet@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-omap2/control.c
arch/arm/mach-omap2/control.h
arch/arm/mach-omap2/sleep34xx.S