diff options
author | R Sricharan <r.sricharan@ti.com> | 2012-04-19 08:12:19 -0400 |
---|---|---|
committer | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2012-07-09 09:44:39 -0400 |
commit | b13e80a8bfe442406495a2fc9e7cbb79d33df48a (patch) | |
tree | 96158952517112c0fc77470af9e049a57453878d /arch/arm/plat-omap/include/plat | |
parent | b009366f285d03e69aeea5f8cc466782dd6f0004 (diff) |
ARM: OMAP5: id: Add cpu id for ES versions
Adding the OMAP5 ES1.0, 2.0 and OMAP5432 cpu revision
detection support.
Signed-off-by: R Sricharan <r.sricharan@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Diffstat (limited to 'arch/arm/plat-omap/include/plat')
-rw-r--r-- | arch/arm/plat-omap/include/plat/cpu.h | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h index 14f050f7a89..e2d911d16fb 100644 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h | |||
@@ -9,7 +9,7 @@ | |||
9 | * | 9 | * |
10 | * Written by Tony Lindgren <tony.lindgren@nokia.com> | 10 | * Written by Tony Lindgren <tony.lindgren@nokia.com> |
11 | * | 11 | * |
12 | * Added OMAP4 specific defines - Santosh Shilimkar<santosh.shilimkar@ti.com> | 12 | * Added OMAP4/5 specific defines - Santosh Shilimkar<santosh.shilimkar@ti.com> |
13 | * | 13 | * |
14 | * This program is free software; you can redistribute it and/or modify | 14 | * This program is free software; you can redistribute it and/or modify |
15 | * it under the terms of the GNU General Public License as published by | 15 | * it under the terms of the GNU General Public License as published by |
@@ -70,6 +70,7 @@ unsigned int omap_rev(void); | |||
70 | * cpu_is_omap443x(): True for OMAP4430 | 70 | * cpu_is_omap443x(): True for OMAP4430 |
71 | * cpu_is_omap446x(): True for OMAP4460 | 71 | * cpu_is_omap446x(): True for OMAP4460 |
72 | * cpu_is_omap447x(): True for OMAP4470 | 72 | * cpu_is_omap447x(): True for OMAP4470 |
73 | * soc_is_omap543x(): True for OMAP5430, OMAP5432 | ||
73 | */ | 74 | */ |
74 | #define GET_OMAP_CLASS (omap_rev() & 0xff) | 75 | #define GET_OMAP_CLASS (omap_rev() & 0xff) |
75 | 76 | ||
@@ -122,6 +123,7 @@ IS_OMAP_CLASS(24xx, 0x24) | |||
122 | IS_OMAP_CLASS(34xx, 0x34) | 123 | IS_OMAP_CLASS(34xx, 0x34) |
123 | IS_OMAP_CLASS(44xx, 0x44) | 124 | IS_OMAP_CLASS(44xx, 0x44) |
124 | IS_AM_CLASS(35xx, 0x35) | 125 | IS_AM_CLASS(35xx, 0x35) |
126 | IS_OMAP_CLASS(54xx, 0x54) | ||
125 | IS_AM_CLASS(33xx, 0x33) | 127 | IS_AM_CLASS(33xx, 0x33) |
126 | 128 | ||
127 | IS_TI_CLASS(81xx, 0x81) | 129 | IS_TI_CLASS(81xx, 0x81) |
@@ -133,6 +135,7 @@ IS_OMAP_SUBCLASS(363x, 0x363) | |||
133 | IS_OMAP_SUBCLASS(443x, 0x443) | 135 | IS_OMAP_SUBCLASS(443x, 0x443) |
134 | IS_OMAP_SUBCLASS(446x, 0x446) | 136 | IS_OMAP_SUBCLASS(446x, 0x446) |
135 | IS_OMAP_SUBCLASS(447x, 0x447) | 137 | IS_OMAP_SUBCLASS(447x, 0x447) |
138 | IS_OMAP_SUBCLASS(543x, 0x543) | ||
136 | 139 | ||
137 | IS_TI_SUBCLASS(816x, 0x816) | 140 | IS_TI_SUBCLASS(816x, 0x816) |
138 | IS_TI_SUBCLASS(814x, 0x814) | 141 | IS_TI_SUBCLASS(814x, 0x814) |
@@ -156,6 +159,8 @@ IS_AM_SUBCLASS(335x, 0x335) | |||
156 | #define cpu_is_omap443x() 0 | 159 | #define cpu_is_omap443x() 0 |
157 | #define cpu_is_omap446x() 0 | 160 | #define cpu_is_omap446x() 0 |
158 | #define cpu_is_omap447x() 0 | 161 | #define cpu_is_omap447x() 0 |
162 | #define soc_is_omap54xx() 0 | ||
163 | #define soc_is_omap543x() 0 | ||
159 | 164 | ||
160 | #if defined(MULTI_OMAP1) | 165 | #if defined(MULTI_OMAP1) |
161 | # if defined(CONFIG_ARCH_OMAP730) | 166 | # if defined(CONFIG_ARCH_OMAP730) |
@@ -291,6 +296,7 @@ IS_OMAP_TYPE(3430, 0x3430) | |||
291 | #define cpu_is_omap2430() 0 | 296 | #define cpu_is_omap2430() 0 |
292 | #define cpu_is_omap3430() 0 | 297 | #define cpu_is_omap3430() 0 |
293 | #define cpu_is_omap3630() 0 | 298 | #define cpu_is_omap3630() 0 |
299 | #define soc_is_omap5430() 0 | ||
294 | 300 | ||
295 | /* | 301 | /* |
296 | * Whether we have MULTI_OMAP1 or not, we still need to distinguish | 302 | * Whether we have MULTI_OMAP1 or not, we still need to distinguish |
@@ -371,11 +377,18 @@ IS_OMAP_TYPE(3430, 0x3430) | |||
371 | # define cpu_is_omap447x() is_omap447x() | 377 | # define cpu_is_omap447x() is_omap447x() |
372 | # endif | 378 | # endif |
373 | 379 | ||
380 | # if defined(CONFIG_SOC_OMAP5) | ||
381 | # undef soc_is_omap54xx | ||
382 | # undef soc_is_omap543x | ||
383 | # define soc_is_omap54xx() is_omap54xx() | ||
384 | # define soc_is_omap543x() is_omap543x() | ||
385 | #endif | ||
386 | |||
374 | /* Macros to detect if we have OMAP1 or OMAP2 */ | 387 | /* Macros to detect if we have OMAP1 or OMAP2 */ |
375 | #define cpu_class_is_omap1() (cpu_is_omap7xx() || cpu_is_omap15xx() || \ | 388 | #define cpu_class_is_omap1() (cpu_is_omap7xx() || cpu_is_omap15xx() || \ |
376 | cpu_is_omap16xx()) | 389 | cpu_is_omap16xx()) |
377 | #define cpu_class_is_omap2() (cpu_is_omap24xx() || cpu_is_omap34xx() || \ | 390 | #define cpu_class_is_omap2() (cpu_is_omap24xx() || cpu_is_omap34xx() || \ |
378 | cpu_is_omap44xx()) | 391 | cpu_is_omap44xx() || soc_is_omap54xx()) |
379 | 392 | ||
380 | /* Various silicon revisions for omap2 */ | 393 | /* Various silicon revisions for omap2 */ |
381 | #define OMAP242X_CLASS 0x24200024 | 394 | #define OMAP242X_CLASS 0x24200024 |
@@ -428,9 +441,14 @@ IS_OMAP_TYPE(3430, 0x3430) | |||
428 | #define OMAP447X_CLASS 0x44700044 | 441 | #define OMAP447X_CLASS 0x44700044 |
429 | #define OMAP4470_REV_ES1_0 (OMAP447X_CLASS | (0x10 << 8)) | 442 | #define OMAP4470_REV_ES1_0 (OMAP447X_CLASS | (0x10 << 8)) |
430 | 443 | ||
444 | #define OMAP54XX_CLASS 0x54000054 | ||
445 | #define OMAP5430_REV_ES1_0 (OMAP54XX_CLASS | (0x30 << 16) | (0x10 << 8)) | ||
446 | #define OMAP5432_REV_ES1_0 (OMAP54XX_CLASS | (0x32 << 16) | (0x10 << 8)) | ||
447 | |||
431 | void omap2xxx_check_revision(void); | 448 | void omap2xxx_check_revision(void); |
432 | void omap3xxx_check_revision(void); | 449 | void omap3xxx_check_revision(void); |
433 | void omap4xxx_check_revision(void); | 450 | void omap4xxx_check_revision(void); |
451 | void omap5xxx_check_revision(void); | ||
434 | void omap3xxx_check_features(void); | 452 | void omap3xxx_check_features(void); |
435 | void ti81xx_check_features(void); | 453 | void ti81xx_check_features(void); |
436 | void omap4xxx_check_features(void); | 454 | void omap4xxx_check_features(void); |