summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPer Fransson <per.xx.fransson@stericsson.com>2010-11-15 14:31:17 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-11-21 22:05:56 +0000
commitffc43ef31395063d32e72de0a9c3d061347c3b94 (patch)
treec9358dbcb3a17672b8e647afcb9e3f912a85e899 /arch
parentc0ba10b512eb2e2a3888b6e6cc0e089f5e7a191b (diff)
downloadop-kernel-dev-ffc43ef31395063d32e72de0a9c3d061347c3b94.zip
op-kernel-dev-ffc43ef31395063d32e72de0a9c3d061347c3b94.tar.gz
ARM: 6473/1: Small update to ux500 specific L2 cache code
This change updates the ux500 specific outer cache code to use the new *_relaxed() I/O accessors. Signed-off-by: Per Fransson <per.xx.fransson@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-ux500/cpu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c
index 73fb1a5..608a137 100644
--- a/arch/arm/mach-ux500/cpu.c
+++ b/arch/arm/mach-ux500/cpu.c
@@ -75,14 +75,14 @@ void __init ux500_init_irq(void)
static inline void ux500_cache_wait(void __iomem *reg, unsigned long mask)
{
/* wait for the operation to complete */
- while (readl(reg) & mask)
+ while (readl_relaxed(reg) & mask)
;
}
static inline void ux500_cache_sync(void)
{
void __iomem *base = __io_address(UX500_L2CC_BASE);
- writel(0, base + L2X0_CACHE_SYNC);
+ writel_relaxed(0, base + L2X0_CACHE_SYNC);
ux500_cache_wait(base + L2X0_CACHE_SYNC, 1);
}
@@ -107,7 +107,7 @@ static void ux500_l2x0_inv_all(void)
uint32_t l2x0_way_mask = (1<<16) - 1; /* Bitmask of active ways */
/* invalidate all ways */
- writel(l2x0_way_mask, l2x0_base + L2X0_INV_WAY);
+ writel_relaxed(l2x0_way_mask, l2x0_base + L2X0_INV_WAY);
ux500_cache_wait(l2x0_base + L2X0_INV_WAY, l2x0_way_mask);
ux500_cache_sync();
}
OpenPOWER on IntegriCloud