From ace22919ce9616453b97737e55825fb5ae274136 Mon Sep 17 00:00:00 2001 From: Jens Wiklander Date: Fri, 15 Oct 2010 15:07:04 +0200 Subject: V2 fix for TEE ST-Ericsson ID: WP270298 Change-Id: I0eb63eba30ed319ff601beb7cd4ac9c307e7414c Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/6620 Reviewed-by: Jens WIKLANDER Tested-by: Jens WIKLANDER --- arch/arm/mach-ux500/tee_ux500.c | 7 +++++-- 1 file 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()) -- cgit v1.2.3