[ARM PATCH] 2311/1: ARM1176 CPU detection

Patch from Catalin Marinas

The CPU Id register changed with the ARM1176 processor and the
ARMv6 architecture description field can be either 7 or 0xF.
This patch also detects the first byte of the part number since
0xF in the description field will also be used for future ARM
architectures.

Signed-off-by: Catalin Marinas
Signed-off-by: Russell King

arch/arm/kernel/setup.c

@@ -255,7 +255,7 @@ int cpu_architecture(void)
 	} else if ((processor_id & 0x0000f000) == 0x00007000) {
 		cpu_arch = (processor_id & (1 << 23)) ? CPU_ARCH_ARMv4T : CPU_ARCH_ARMv3;
 	} else {
-		cpu_arch = (processor_id >> 16) & 15;
+		cpu_arch = (processor_id >> 16) & 7;
 		if (cpu_arch)
 			cpu_arch += CPU_ARCH_ARMv3;
 	}

arch/arm/mm/proc-v6.S

@@ -250,8 +250,8 @@ cpu_elf_name:
 	 */
 	.type	__v6_proc_info, #object
 __v6_proc_info:
-	.long	0x00070000
-	.long	0x00ff0000
+	.long	0x0007b000
+	.long	0x0007f000
 	.long	0x00000c0e
 	b	__v6_setup
 	.long	cpu_arch_name