aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500/cache-l2x0.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-14 16:29:32 +0200
committerArnd Bergmann <arnd@arndb.de>2012-05-14 16:29:32 +0200
commit815acebff7ac578970986ca3f0ff406c92a0e243 (patch)
tree651c411bbedeb0500ab9912766e992be3d5a8bab /arch/arm/mach-ux500/cache-l2x0.c
parent417f381c4568212275f0244500d7d5e1cdb5f99f (diff)
parent72fb92200d6c31b9982c06784e4bcff2f5b7d8b6 (diff)
downloadlinux-stericsson-815acebff7ac578970986ca3f0ff406c92a0e243.tar.gz
Merge branch 'ux500/delete-u5500' into next/soc
Conflicts: arch/arm/mach-ux500/cache-l2x0.c arch/arm/mach-ux500/clock.c arch/arm/mach-ux500/cpu.c arch/arm/mach-ux500/mbox-db5500.c arch/arm/mach-ux500/platsmp.c arch/arm/mach-ux500/timer.c Resolve lots of identical conflicts between the removal of u5500 and the addition of u8540. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-ux500/cache-l2x0.c')
-rw-r--r--arch/arm/mach-ux500/cache-l2x0.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/cache-l2x0.c b/arch/arm/mach-ux500/cache-l2x0.c
index 677bb7683c71..dc12394295d5 100644
--- a/arch/arm/mach-ux500/cache-l2x0.c
+++ b/arch/arm/mach-ux500/cache-l2x0.c
@@ -38,9 +38,7 @@ static int __init ux500_l2x0_init(void)
{
u32 aux_val = 0x3e000000;
- if (cpu_is_u5500())
- l2x0_base = __io_address(U5500_L2CC_BASE);
- else if (cpu_is_u8500_family())
+ if (cpu_is_u8500_family())
l2x0_base = __io_address(U8500_L2CC_BASE);
else
ux500_unknown_soc();