Commit a5d4506d authored Apr 02, 2014 by Chao Xie Linux Committed by Russell King Apr 08, 2014

ARM: 8016/1: Check cpu id in pj4_cp0_init.



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>

parent fdb487f5

arch/arm/kernel/pj4-cp0.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -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);