summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-05-15 10:07:14 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-05-15 11:10:03 (GMT)
commit7705dd256ce363f8b01429efb2f0dc4d1ee23c89 (patch)
treedbfc5fb3c612a758d2d170c1f12ddbd78c3f3da0
parentd965b0fca7dcde3f82c982e0bf1631069fdeb8c9 (diff)
downloadlinux-7705dd256ce363f8b01429efb2f0dc4d1ee23c89.tar.xz
ARM: l2c: write auxiliary control register first
Before calling the controller specific configuration function, write the auxiliary control register first, so that bits shared with other registers (such as the prefetch control register) are not overwritten by the later write to the auxctrl register. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mm/cache-l2x0.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index 1471c0f..977eb9f 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -115,10 +115,10 @@ static void l2c_configure(void __iomem *base)
return;
}
+ l2c_write_sec(l2x0_saved_regs.aux_ctrl, base, L2X0_AUX_CTRL);
+
if (l2x0_data->configure)
l2x0_data->configure(base);
-
- l2c_write_sec(l2x0_saved_regs.aux_ctrl, base, L2X0_AUX_CTRL);
}
/*