summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-06-26 21:46:08 +0200
committerArnd Bergmann <arnd@arndb.de>2013-06-27 15:00:56 +0200
commit31c72abbcadbeabafa34f62f7530c09f2b0f1ccd (patch)
tree4ae68e0e23ee2384307b5bf037c6c165870a5d2c /arch/arm
parent0ad578ef25be566aa80b28115c9d696e511bc6be (diff)
downloadblackbird-obmc-linux-31c72abbcadbeabafa34f62f7530c09f2b0f1ccd.tar.gz
blackbird-obmc-linux-31c72abbcadbeabafa34f62f7530c09f2b0f1ccd.zip
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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-ux500/cache-l2x0.c3
1 files changed, 2 insertions, 1 deletions
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();
OpenPOWER on IntegriCloud