summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/omap4-common.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-10-28 14:42:06 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-10-28 14:42:06 +0100
commitbe6786ac738801d39cfd264ec88c352efd029578 (patch)
tree3652ce6cfbfdb1dbb8cf5a664e5e84c6d3abd260 /arch/arm/mach-omap2/omap4-common.c
parentf9cef506815386df4bd7e463b59e0a0984ce0355 (diff)
parentae6948048c417d429b8a0f85fad13e483f7cc1a3 (diff)
downloadblackbird-op-linux-be6786ac738801d39cfd264ec88c352efd029578.tar.gz
blackbird-op-linux-be6786ac738801d39cfd264ec88c352efd029578.zip
Merge branch 'l2x0-pull-rmk' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into devel-stable
Diffstat (limited to 'arch/arm/mach-omap2/omap4-common.c')
-rw-r--r--arch/arm/mach-omap2/omap4-common.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c
index 923f9f5f91ce..2f895553e6a8 100644
--- a/arch/arm/mach-omap2/omap4-common.c
+++ b/arch/arm/mach-omap2/omap4-common.c
@@ -44,6 +44,13 @@ void __init gic_init_irq(void)
}
#ifdef CONFIG_CACHE_L2X0
+
+static void omap4_l2x0_disable(void)
+{
+ /* Disable PL310 L2 Cache controller */
+ omap_smc1(0x102, 0x0);
+}
+
static int __init omap_l2_cache_init(void)
{
/*
@@ -70,6 +77,12 @@ static int __init omap_l2_cache_init(void)
else
l2x0_init(l2cache_base, 0x0e070000, 0xc0000fff);
+ /*
+ * Override default outer_cache.disable with a OMAP4
+ * specific one
+ */
+ outer_cache.disable = omap4_l2x0_disable;
+
return 0;
}
early_initcall(omap_l2_cache_init);
OpenPOWER on IntegriCloud