summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-ux500/tee_ux500.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/mach-ux500/tee_ux500.c b/arch/arm/mach-ux500/tee_ux500.c
index 707e91284a1..160ca529261 100644
--- a/arch/arm/mach-ux500/tee_ux500.c
+++ b/arch/arm/mach-ux500/tee_ux500.c
@@ -24,19 +24,14 @@ static u32 call_sec_rom_bridge(u32 service_id, u32 cfg, ...)
va_list ap;
u32 ret;
- if (cpu_is_u8500v2())
+ if (cpu_is_u8500v20_or_later())
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())
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;
- }
+ else
+ ux500_unknown_soc();
va_start(ap, cfg);
ret = hw_sec_rom_pub_bridge(service_id, cfg, ap);