aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-03-17 08:59:08 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-05-29 19:48:45 -0400
commitd9d1f3e2d71144348d73210cf9f1fe0b32481c79 (patch)
treee96baeb96ed19979819dc197e11b1e0e9c06c627 /arch/arm/mm
parent1a5a954ce0dd8ba1fc8b5305bcdb6e4cf7d6939b (diff)
ARM: l2c: check that DT files specify the required "cache-unified" property
This is a required property, and should always be specified. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm')
-rw-r--r--arch/arm/mm/cache-l2x0.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index c5c8a4152825..790343b2c13b 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -1364,6 +1364,10 @@ int __init l2x0_of_init(u32 aux_val, u32 aux_mask)
1364 1364
1365 data = of_match_node(l2x0_ids, np)->data; 1365 data = of_match_node(l2x0_ids, np)->data;
1366 1366
1367 /* All L2 caches are unified, so this property should be specified */
1368 if (!of_property_read_bool(np, "cache-unified"))
1369 pr_err("L2C: device tree omits to specify unified cache\n");
1370
1367 /* L2 configuration can only be changed if the cache is disabled */ 1371 /* L2 configuration can only be changed if the cache is disabled */
1368 if (!(readl_relaxed(l2x0_base + L2X0_CTRL) & L2X0_CTRL_EN)) 1372 if (!(readl_relaxed(l2x0_base + L2X0_CTRL) & L2X0_CTRL_EN))
1369 if (data->of_parse) 1373 if (data->of_parse)