From: Linus Walleij <linus.walleij@linaro.org>
Date: Wed, 26 Jun 2013 19:46:08 +0000 (+0200)
Subject: ARM: ux500: bail out on alien cpus
X-Git-Tag: next-20130628~18^2~3^2~1^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4cb2955545bcfa82336a0a7449284b8cb3f435e7;p=karo-tx-linux.git

ARM: ux500: bail out on alien cpus

This makes the l2x0 initialization fail gracefully on non-ux500
systems.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
---

diff --git a/arch/arm/mach-ux500/cache-l2x0.c b/arch/arm/mach-ux500/cache-l2x0.c
index f58615b5c601..82ccf1d98735 100644
--- a/arch/arm/mach-ux500/cache-l2x0.c
+++ b/arch/arm/mach-ux500/cache-l2x0.c
@@ -42,7 +42,8 @@ static int __init ux500_l2x0_init(void)
 	if (cpu_is_u8500_family() || cpu_is_ux540_family())
 		l2x0_base = __io_address(U8500_L2CC_BASE);
 	else
-		ux500_unknown_soc();
+		/* Non-Ux500 platform */
+		return -ENODEV;
 
 	/* Unlock before init */
 	ux500_l2x0_unlock();