From aeb2742534db86281ed3a6dfc295888c4893f4a2 Mon Sep 17 00:00:00 2001 From: Jonas Aaberg Date: Tue, 20 Dec 2011 08:24:42 +0100 Subject: ARM: ux500: tee: Always assume v2.0 or later Remove check for pre v2.0 db8500 since pre v2.0 hardware is no longer supported. ST-Ericsson Linux next: - ST-Ericsson ID: 370799 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I5d1ab944c6d85cc39eb748a9bc585c2c6ca5e5ac Signed-off-by: Jonas Aaberg Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/43189 Reviewed-by: QABUILD Reviewed-by: Joakim BECH Reviewed-by: QATEST --- arch/arm/mach-ux500/tee_ux500.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-ux500/tee_ux500.c b/arch/arm/mach-ux500/tee_ux500.c index 0fc10c0a744..9fa985a48c8 100644 --- a/arch/arm/mach-ux500/tee_ux500.c +++ b/arch/arm/mach-ux500/tee_ux500.c @@ -28,7 +28,7 @@ static u32 call_sec_rom_bridge(u32 service_id, u32 cfg, ...) hw_sec_rom_pub_bridge = (bridge_func) ((u32)IO_ADDRESS_DB9540_ROM (U9540_BOOT_ROM_BASE + 0x17300)); - else if (cpu_is_u8500v20_or_later()) + else if (cpu_is_u8500()) hw_sec_rom_pub_bridge = (bridge_func) ((u32)IO_ADDRESS(U8500_BOOT_ROM_BASE + 0x17300)); else if (cpu_is_u5500()) -- cgit v1.2.3