ARM: 8046/1: proc: add support for the Cortex-A17 processor

Cortex-A17 has identical initialisation requirements to Cortex-A12, so
hook it up in proc-v7.S in the same way.

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h
index c651e3b26ec703b08cea0128eb76c23d9aa94d46..550bf7110fef240923bcb54907221b990bd219bc 100644 (file)
--- a/arch/arm/include/asm/cputype.h
+++ b/arch/arm/include/asm/cputype.h
@@ -72,6 +72,7 @@
 #define ARM_CPU_PART_CORTEX_A15                0xC0F0
 #define ARM_CPU_PART_CORTEX_A7         0xC070
 #define ARM_CPU_PART_CORTEX_A12                0xC0D0
+#define ARM_CPU_PART_CORTEX_A17                0xC0E0
 
 #define ARM_CPU_XSCALE_ARCH_MASK       0xe000
 #define ARM_CPU_XSCALE_ARCH_V1         0x2000

diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index b74ea60891d501333f745b10d4f7a4d40353c513..3db2c2f04a303711e3c154a0ea2ebb5a3c17faa2 100644 (file)
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -216,6 +216,7 @@ __v7_cr7mp_setup:
 __v7_ca7mp_setup:
 __v7_ca12mp_setup:
 __v7_ca15mp_setup:
+__v7_ca17mp_setup:
        mov     r10, #0
 1:
 #ifdef CONFIG_SMP
@@ -526,6 +527,16 @@ __v7_ca15mp_proc_info:
        __v7_proc __v7_ca15mp_setup
        .size   __v7_ca15mp_proc_info, . - __v7_ca15mp_proc_info
 
+       /*
+        * ARM Ltd. Cortex A17 processor.
+        */
+       .type   __v7_ca17mp_proc_info, #object
+__v7_ca17mp_proc_info:
+       .long   0x410fc0e0
+       .long   0xff0ffff0
+       __v7_proc __v7_ca17mp_setup
+       .size   __v7_ca17mp_proc_info, . - __v7_ca17mp_proc_info
+
        /*
         * Qualcomm Inc. Krait processors.
         */