From 630355b7a64d4c4d42d217b643382ea95135d7a5 Mon Sep 17 00:00:00 2001 From: Philippe Langlais Date: Tue, 5 Apr 2011 13:53:10 +0200 Subject: ux500: add u5500 specific macros This patch is based on similar patch from Rickard Evertsson Although this patch is fixing fewer files. Signed-off-by: Mian Yousaf Kaukab Conflicts: arch/arm/mach-ux500/clock.c --- arch/arm/mach-ux500/tee_ux500.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-ux500/tee_ux500.c b/arch/arm/mach-ux500/tee_ux500.c index c009afe26ae..2e6a2e89f0d 100644 --- a/arch/arm/mach-ux500/tee_ux500.c +++ b/arch/arm/mach-ux500/tee_ux500.c @@ -8,11 +8,10 @@ #include #include #include +#include #include -#define BOOT_BRIDGE_FUNC (U8500_BOOT_ROM_BASE + 0x18300) - #define ISSWAPI_EXECUTE_TA 0x11000001 #define ISSWAPI_CLOSE_TA 0x11000002 @@ -25,8 +24,16 @@ static u32 call_sec_rom_bridge(u32 service_id, u32 cfg, ...) va_list ap; u32 ret; - hw_sec_rom_pub_bridge = - (bridge_func)((u32)IO_ADDRESS(BOOT_BRIDGE_FUNC)); + if (cpu_is_u8500()) + hw_sec_rom_pub_bridge = (bridge_func) + ((u32)IO_ADDRESS(U8500_BOOT_ROM_BASE + 0x18300)); + else if (cpu_is_u5500()) + hw_sec_rom_pub_bridge = (bridge_func) + ((u32)IO_ADDRESS(U5500_BOOT_ROM_BASE + 0x18300)); + else { + pr_err("tee-ux500: Unknown DB Asic!\n"); + return -EIO; + } va_start(ap, cfg); ret = hw_sec_rom_pub_bridge(service_id, cfg, ap); -- cgit v1.2.3