diff options
| author | Jens Wiklander <jens.wiklander@stericsson.com> | 2010-10-15 15:07:04 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:04:35 +0200 |
| commit | ace22919ce9616453b97737e55825fb5ae274136 (patch) | |
| tree | c91a6e19c29143649c32d276927261cb14468743 | |
| parent | 630355b7a64d4c4d42d217b643382ea95135d7a5 (diff) | |
V2 fix for TEE
ST-Ericsson ID: WP270298
Change-Id: I0eb63eba30ed319ff601beb7cd4ac9c307e7414c
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/6620
Reviewed-by: Jens WIKLANDER <jens.wiklander@stericsson.com>
Tested-by: Jens WIKLANDER <jens.wiklander@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/tee_ux500.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/tee_ux500.c b/arch/arm/mach-ux500/tee_ux500.c index 2e6a2e89f0d..707e91284a1 100644 --- a/arch/arm/mach-ux500/tee_ux500.c +++ b/arch/arm/mach-ux500/tee_ux500.c @@ -20,11 +20,14 @@ static u32 call_sec_rom_bridge(u32 service_id, u32 cfg, ...) { typedef u32 (*bridge_func)(u32, u32, va_list); - static bridge_func hw_sec_rom_pub_bridge; + bridge_func hw_sec_rom_pub_bridge; va_list ap; u32 ret; - if (cpu_is_u8500()) + if (cpu_is_u8500v2()) + hw_sec_rom_pub_bridge = (bridge_func) + ((u32)IO_ADDRESS(U8500_BOOT_ROM_BASE + 0x17300)); + else if (cpu_is_u8500v1()) hw_sec_rom_pub_bridge = (bridge_func) ((u32)IO_ADDRESS(U8500_BOOT_ROM_BASE + 0x18300)); else if (cpu_is_u5500()) |