diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-15 20:29:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-15 20:29:29 +0100 |
| commit | a5d53ad243dc3178fa9001d8ab1f19c63f8debd5 (patch) | |
| tree | 0139239f56b2dea497a003b4512a4ba849591306 /arch/arm64/include/asm/cputype.h | |
| parent | 15fdd2469e03d44975d548a73e689a725e76a5ee (diff) | |
| parent | 8751cf9a6c5f5bf02a2de8a4c025e09b38556df4 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
Conflicts:
Documentation/arm64/tagged-pointers.txt
arch/arm64/Kconfig
arch/arm64/boot/dts/Makefile
arch/arm64/include/asm/arch_timer.h
arch/arm64/include/asm/elf.h
arch/arm64/include/asm/spinlock.h
arch/arm64/kernel/smp.c
Diffstat (limited to 'arch/arm64/include/asm/cputype.h')
| -rw-r--r-- | arch/arm64/include/asm/cputype.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h index a8053d89512f..e371936b8ab2 100644 --- a/arch/arm64/include/asm/cputype.h +++ b/arch/arm64/include/asm/cputype.h @@ -47,11 +47,14 @@ }) #define ARM_CPU_IMP_ARM 0x41 +#define ARM_CPU_IMP_APM 0x50 #define ARM_CPU_PART_AEM_V8 0xD0F0 #define ARM_CPU_PART_FOUNDATION 0xD000 #define ARM_CPU_PART_CORTEX_A57 0xD070 +#define APM_CPU_PART_POTENZA 0x0000 + #ifndef __ASSEMBLY__ /* |