summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Aaberg <jonas.aberg@stericsson.com>2011-12-20 08:24:42 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:04:39 +0200
commitaeb2742534db86281ed3a6dfc295888c4893f4a2 (patch)
tree97eff747dc27f2121f0e3fdff6822d16b4fc9bf7
parent3ee97c4b21460d30f853e936808e4074fc86da14 (diff)
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 <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/43189 Reviewed-by: QABUILD Reviewed-by: Joakim BECH <joakim.xx.bech@stericsson.com> Reviewed-by: QATEST
-rw-r--r--arch/arm/mach-ux500/tee_ux500.c2
1 files changed, 1 insertions, 1 deletions
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())