git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.37-rc2' into sched/core
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
omap4-common.c
diff --git
a/arch/arm/mach-omap2/omap4-common.c
b/arch/arm/mach-omap2/omap4-common.c
index
923f9f5
..
2f89555
100644
(file)
--- 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
}
#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)
{
/*
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);
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);
return 0;
}
early_initcall(omap_l2_cache_init);