aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>2010-07-07 13:02:26 +0200
committerJohn Rigby <john.rigby@linaro.org>2010-09-02 22:45:45 -0600
commitcb044cdd897b06571fd1baf5d1655d9b691e491a (patch)
tree963fd19e5557fea38177cb404a22cc9c74f257c4 /arch
parent2f4aed910f7ddec3c27b8a48f52ac4b437cf4b07 (diff)
downloadlinux-2.6.34-ux500-cb044cdd897b06571fd1baf5d1655d9b691e491a.tar.gz
mach-ux500: updating l2x0 init from linux-next
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Change-Id: I85be5ca2f9178f6bbe5d3b0bd995213e0c9a0691 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2547 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-ux500/cpu.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c
index 7c14c4608b1..af6e02eba19 100644
--- a/arch/arm/mach-ux500/cpu.c
+++ b/arch/arm/mach-ux500/cpu.c
@@ -34,6 +34,8 @@ static struct map_desc ux500_io_desc[] __initdata = {
__IO_DEV_DESC(UX500_GIC_CPU_BASE, SZ_4K),
__IO_DEV_DESC(UX500_GIC_DIST_BASE, SZ_4K),
__IO_DEV_DESC(UX500_L2CC_BASE, SZ_4K),
+ __IO_DEV_DESC(UX500_TWD_BASE, SZ_4K),
+ __IO_DEV_DESC(UX500_SCU_BASE, SZ_4K),
__IO_DEV_DESC(UX500_CLKRST1_BASE, SZ_4K),
__IO_DEV_DESC(UX500_CLKRST2_BASE, SZ_4K),
@@ -80,10 +82,17 @@ void __init ux500_init_irq(void)
}
#ifdef CONFIG_CACHE_L2X0
-static int __init ux500_l2x0_init(void)
+static int ux500_l2x0_init(void)
{
- l2x0_init((void *)IO_ADDRESS(UX500_L2CC_BASE), 0x3e060000, 0x3e060000);
+ void __iomem *l2x0_base;
+
+ l2x0_base = __io_address(UX500_L2CC_BASE);
+
+ /* 64KB way size, 8 way associativity, force WA */
+ l2x0_init(l2x0_base, 0x3e060000, 0xc0000fff);
+
return 0;
}
early_initcall(ux500_l2x0_init);
#endif
+