diff options
| -rw-r--r-- | arch/arm/mach-pxa/Kconfig | 5 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/hardware.h | 17 |
2 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index 89c992b8f75b..626cecb6e739 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
| @@ -21,6 +21,11 @@ config CPU_PXA930 | |||
| 21 | 21 | ||
| 22 | config CPU_PXA935 | 22 | config CPU_PXA935 |
| 23 | bool "PXA935 (codename Tavor-P65)" | 23 | bool "PXA935 (codename Tavor-P65)" |
| 24 | select CPU_PXA930 | ||
| 25 | |||
| 26 | config CPU_PXA950 | ||
| 27 | bool "PXA950 (codename Tavor-PV2)" | ||
| 28 | select CPU_PXA930 | ||
| 24 | 29 | ||
| 25 | endmenu | 30 | endmenu |
| 26 | 31 | ||
diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h index 16ab79547dae..aa3d9f70a08a 100644 --- a/arch/arm/mach-pxa/include/mach/hardware.h +++ b/arch/arm/mach-pxa/include/mach/hardware.h | |||
| @@ -197,6 +197,16 @@ | |||
| 197 | #define __cpu_is_pxa935(id) (0) | 197 | #define __cpu_is_pxa935(id) (0) |
| 198 | #endif | 198 | #endif |
| 199 | 199 | ||
| 200 | #ifdef CONFIG_CPU_PXA950 | ||
| 201 | #define __cpu_is_pxa950(id) \ | ||
| 202 | ({ \ | ||
| 203 | unsigned int _id = (id) >> 4 & 0xfff; \ | ||
| 204 | id == 0x697; \ | ||
| 205 | }) | ||
| 206 | #else | ||
| 207 | #define __cpu_is_pxa950(id) (0) | ||
| 208 | #endif | ||
| 209 | |||
| 200 | #define cpu_is_pxa210() \ | 210 | #define cpu_is_pxa210() \ |
| 201 | ({ \ | 211 | ({ \ |
| 202 | __cpu_is_pxa210(read_cpuid_id()); \ | 212 | __cpu_is_pxa210(read_cpuid_id()); \ |
| @@ -249,6 +259,13 @@ | |||
| 249 | __cpu_is_pxa935(id); \ | 259 | __cpu_is_pxa935(id); \ |
| 250 | }) | 260 | }) |
| 251 | 261 | ||
| 262 | #define cpu_is_pxa950() \ | ||
| 263 | ({ \ | ||
| 264 | unsigned int id = read_cpuid(CPUID_ID); \ | ||
| 265 | __cpu_is_pxa950(id); \ | ||
| 266 | }) | ||
| 267 | |||
| 268 | |||
| 252 | /* | 269 | /* |
| 253 | * CPUID Core Generation Bit | 270 | * CPUID Core Generation Bit |
| 254 | * <= 0x2 for pxa21x/pxa25x/pxa26x/pxa27x | 271 | * <= 0x2 for pxa21x/pxa25x/pxa26x/pxa27x |
