diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2011-06-01 08:26:59 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:04:36 +0200 |
| commit | 5b40311eb26ec74d23f00ed5ecbb17982ed9d897 (patch) | |
| tree | 99e91c8c4bc98e140742626eca7c700959de0b58 | |
| parent | ac58ec89186c7270936a6d0e122a33b06e78b78e (diff) | |
ARM: ux500: tee: Remove u8500 v1 support
ST-Ericsson Linux next: Not tested, ask SSM for ER
ST-Ericsson ID: 342987
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: Ia8afe98cdafbc5f11c115a061e5be75d9bd7ece0
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24284
Reviewed-by: Joakim BECH <joakim.xx.bech@stericsson.com>
Reviewed-by: QATEST
| -rw-r--r-- | arch/arm/mach-ux500/tee_ux500.c | 11 |
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); |