diff options
| author | Michel JAOUEN <michel.jaouen@stericsson.com> | 2012-01-19 18:21:50 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:04:39 +0200 |
| commit | 3ee97c4b21460d30f853e936808e4074fc86da14 (patch) | |
| tree | 3ca89b1af4e58cee5268e3e73552c6db3d8ba0bf | |
| parent | 63cbfc54c34637e71604db1bad3288eeadf5338c (diff) | |
mach-ux500, drivers: u9540 security fix
ST-Ericsson ID: 409625
ST-Ericsson FOSS-OUT ID: trivial
ST-Ericsson Linux next: NA
Depends-On: Iff4121811d2afbf581eec0905077c58bff96ce09
Change-Id: I43d5d593a4b6183d39322851db930e687177eead
Signed-off-by: Michel JAOUEN <michel.jaouen@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/45317
Reviewed-by: QATOOLS
Reviewed-by: QABUILD
Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
Reviewed-by: Berne HEBARK <berne.hebark@stericsson.com>
Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/tee_ux500.c | 6 | ||||
| -rw-r--r-- | drivers/crypto/ux500/cryp/cryp.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/tee_ux500.c b/arch/arm/mach-ux500/tee_ux500.c index 160ca529261..0fc10c0a744 100644 --- a/arch/arm/mach-ux500/tee_ux500.c +++ b/arch/arm/mach-ux500/tee_ux500.c @@ -24,7 +24,11 @@ static u32 call_sec_rom_bridge(u32 service_id, u32 cfg, ...) va_list ap; u32 ret; - if (cpu_is_u8500v20_or_later()) + if (cpu_is_u9540()) + hw_sec_rom_pub_bridge = (bridge_func) + ((u32)IO_ADDRESS_DB9540_ROM + (U9540_BOOT_ROM_BASE + 0x17300)); + else 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_u5500()) diff --git a/drivers/crypto/ux500/cryp/cryp.c b/drivers/crypto/ux500/cryp/cryp.c index 211200fed34..cec92af2f73 100644 --- a/drivers/crypto/ux500/cryp/cryp.c +++ b/drivers/crypto/ux500/cryp/cryp.c @@ -37,7 +37,7 @@ int cryp_check(struct cryp_device_data *device_data) if (NULL == device_data) return -EINVAL; - if (cpu_is_u8500()) + if (cpu_is_u8500() || cpu_is_u9540()) peripheralID2 = CRYP_PERIPHERAL_ID2_DB8500; else if (cpu_is_u5500()) peripheralID2 = CRYP_PERIPHERAL_ID2_DB5500; |