From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 19 Mar 2014 12:47:58 +0000 (+0000)
Subject: ARM: l2c: ux500: don't try to change the L2 cache auxiliary control register
X-Git-Tag: firefly_0821_release~176^2~3820^2~13^2~1^3~9
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c59917f877ae9b94d4ba146600c763ed6ae97a1b;p=firefly-linux-kernel-4.4.55.git

ARM: l2c: ux500: don't try to change the L2 cache auxiliary control register

ux500 can't change the auxiliary control register, so there's no point
passing values to try and modify it to the l2x0 init functions.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mach-ux500/cache-l2x0.c b/arch/arm/mach-ux500/cache-l2x0.c
index 5b891d051054..842ebedbdd1c 100644
--- a/arch/arm/mach-ux500/cache-l2x0.c
+++ b/arch/arm/mach-ux500/cache-l2x0.c
@@ -57,9 +57,9 @@ static int __init ux500_l2x0_init(void)
 	outer_cache.write_sec = ux500_l2c310_write_sec;
 
 	if (of_have_populated_dt())
-		l2x0_of_init(0x3e000000, 0xc00f0fff);
+		l2x0_of_init(0, ~0);
 	else
-		l2x0_init(l2x0_base, 0x3e000000, 0xc00f0fff);
+		l2x0_init(l2x0_base, 0, ~0);
 
 	return 0;
 }