ARM: 8016/1: Check cpu id in pj4_cp0_init.
authorChao Xie Linux <xiechao.mail@gmail.com>
Wed, 2 Apr 2014 01:50:03 +0000 (02:50 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 8 Apr 2014 16:55:28 +0000 (17:55 +0100)
Check cpu id in pj4_cp0_init. So for no-PJ4 V7 cpus,
pj4_cpu0_init just return.
This fix will help to make the all the V7 cpus(PJ4 and no-PJ4)
can use code.

Signed-off-by: Chao Xie <chao.xie@marvell.com>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Tested-by: Kevin Hilman <khilman@linaro.org>
Tested-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Matt Porter <mporter@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/kernel/pj4-cp0.c

index 679cf4d18c08bfa99fec75cadd24027c192a1706..fc72086362842436381d0595c1afea648eb7b830 100644 (file)
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <asm/thread_notify.h>
+#include <asm/cputype.h>
 
 static int iwmmxt_do(struct notifier_block *self, unsigned long cmd, void *t)
 {
@@ -80,6 +81,9 @@ static int __init pj4_cp0_init(void)
 {
        u32 cp_access;
 
+       if (!cpu_is_pj4())
+               return 0;
+
        cp_access = pj4_cp_access_read() & ~0xf;
        pj4_cp_access_write(cp_access);