summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/control.c
diff options
context:
space:
mode:
authorMohsan Habibi <mohsan@motorola.com>2014-08-01 19:39:20 -0400
committerMohsan Habibi <mohsan@motorola.com>2014-09-04 19:32:52 +0000
commit2c2074ce7ee8f90b7eae5f73094f5ab5d3a5e06e (patch)
tree0cd9a665d55e8a13f25426f687f9079d20c4448b /arch/arm/mach-omap2/control.c
parentd4ae2fe7494a64ef1324165cb98609c51cba2d3a (diff)
downloadolio-linux-3.10-2c2074ce7ee8f90b7eae5f73094f5ab5d3a5e06e.tar.xz
olio-linux-3.10-2c2074ce7ee8f90b7eae5f73094f5ab5d3a5e06e.zip
IKXCLOCK-3184 arm: omap3: use dt reserve for secure ram
Since the OMAP smc #1 (secure memory interface call #1) isn't able to handle memory located in CS1 properly, convert the allocation of this space to use device tree reserve instead, so we can specify the exact phsyical address to make sure it gets allocated in CS0 memory. Change-Id: I3c1619594ec007cb1960f8845dc55c6e57b2537d Signed-off-by: Mohsan Habibi <mohsan@motorola.com>
Diffstat (limited to 'arch/arm/mach-omap2/control.c')
-rw-r--r--arch/arm/mach-omap2/control.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index ab5ec4b28ab..a7da7ccd1a1 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -92,7 +92,7 @@ struct omap3_scratchpad_sdrc_block {
u32 block_size;
};
-void *omap3_secure_ram_storage;
+phys_addr_t omap3_secure_ram_context;
/*
* This is used to store ARM registers in SDRAM before attempting
@@ -360,7 +360,7 @@ void omap3_save_scratchpad_contents(void)
scratchpad_contents.secure_ram_restore_ptr = 0x0;
else
scratchpad_contents.secure_ram_restore_ptr =
- (u32) __pa(omap3_secure_ram_storage);
+ (u32) omap3_secure_ram_context;
scratchpad_contents.sdrc_module_semaphore = 0x0;
scratchpad_contents.prcm_block_offset = 0x2C;
scratchpad_contents.sdrc_block_offset = 0x64;