diff options
author | Will Deacon <will.deacon@arm.com> | 2014-05-02 12:06:02 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-05-25 18:47:45 -0400 |
commit | cd000cf650cd43dc0dc37032cb4016985c9dda6c (patch) | |
tree | e6953547c37ee607bf0eed6753adcecbc11c9b8a | |
parent | 1dc5455f6f0b2422b410cc913e8af32a617ba921 (diff) |
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>
-rw-r--r-- | arch/arm/include/asm/cputype.h | 1 | ||||
-rw-r--r-- | arch/arm/mm/proc-v7.S | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h index c651e3b26ec7..550bf7110fef 100644 --- a/arch/arm/include/asm/cputype.h +++ b/arch/arm/include/asm/cputype.h | |||
@@ -72,6 +72,7 @@ | |||
72 | #define ARM_CPU_PART_CORTEX_A15 0xC0F0 | 72 | #define ARM_CPU_PART_CORTEX_A15 0xC0F0 |
73 | #define ARM_CPU_PART_CORTEX_A7 0xC070 | 73 | #define ARM_CPU_PART_CORTEX_A7 0xC070 |
74 | #define ARM_CPU_PART_CORTEX_A12 0xC0D0 | 74 | #define ARM_CPU_PART_CORTEX_A12 0xC0D0 |
75 | #define ARM_CPU_PART_CORTEX_A17 0xC0E0 | ||
75 | 76 | ||
76 | #define ARM_CPU_XSCALE_ARCH_MASK 0xe000 | 77 | #define ARM_CPU_XSCALE_ARCH_MASK 0xe000 |
77 | #define ARM_CPU_XSCALE_ARCH_V1 0x2000 | 78 | #define ARM_CPU_XSCALE_ARCH_V1 0x2000 |
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index b74ea60891d5..3db2c2f04a30 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S | |||
@@ -216,6 +216,7 @@ __v7_cr7mp_setup: | |||
216 | __v7_ca7mp_setup: | 216 | __v7_ca7mp_setup: |
217 | __v7_ca12mp_setup: | 217 | __v7_ca12mp_setup: |
218 | __v7_ca15mp_setup: | 218 | __v7_ca15mp_setup: |
219 | __v7_ca17mp_setup: | ||
219 | mov r10, #0 | 220 | mov r10, #0 |
220 | 1: | 221 | 1: |
221 | #ifdef CONFIG_SMP | 222 | #ifdef CONFIG_SMP |
@@ -527,6 +528,16 @@ __v7_ca15mp_proc_info: | |||
527 | .size __v7_ca15mp_proc_info, . - __v7_ca15mp_proc_info | 528 | .size __v7_ca15mp_proc_info, . - __v7_ca15mp_proc_info |
528 | 529 | ||
529 | /* | 530 | /* |
531 | * ARM Ltd. Cortex A17 processor. | ||
532 | */ | ||
533 | .type __v7_ca17mp_proc_info, #object | ||
534 | __v7_ca17mp_proc_info: | ||
535 | .long 0x410fc0e0 | ||
536 | .long 0xff0ffff0 | ||
537 | __v7_proc __v7_ca17mp_setup | ||
538 | .size __v7_ca17mp_proc_info, . - __v7_ca17mp_proc_info | ||
539 | |||
540 | /* | ||
530 | * Qualcomm Inc. Krait processors. | 541 | * Qualcomm Inc. Krait processors. |
531 | */ | 542 | */ |
532 | .type __krait_proc_info, #object | 543 | .type __krait_proc_info, #object |