imx: mx31 use new formula for get_cpu_rev

Use new formula for get_cpu_rev, since we need to use this formula
to do runtime check for all i.MXes.
Signed-off-by: NPeng Fan <Peng.Fan@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Reviewed-by: NStefano Babic <sbabic@denx.de>

arch/arm/cpu/arm1136/mx31/generic.c

@@ -175,7 +175,7 @@ u32 get_cpu_rev(void)
 
 	for (i = 0; i < ARRAY_SIZE(mx31_cpu_type); i++)
 		if (srev == mx31_cpu_type[i].srev)
-			return mx31_cpu_type[i].v;
+			return mx31_cpu_type[i].v | (MXC_CPU_MX31 << 12);
 
 	return srev | 0x8000;
 }

arch/arm/include/asm/arch-mx31/sys_proto.h

@@ -8,6 +8,8 @@
 #ifndef _SYS_PROTO_H_
 #define _SYS_PROTO_H_
 
+#include "../arch-imx/cpu.h"
+
 struct mxc_weimcs {
 	u32 upper;
 	u32 lower;