diff options
author | Afzal Mohammed <afzal@ti.com> | 2013-05-27 10:35:51 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-06-12 11:00:34 -0400 |
commit | c664d0a9a1ebbff4aa20705c0ff23be4a1f9b5de (patch) | |
tree | 20da9acc541402781f46cffed733e8048dacdf01 /arch/arm/mach-omap2/soc.h | |
parent | 33f82f337989c37163ba6e1e8c0a63528ecb385b (diff) |
ARM: OMAP2+: AM43x: soc_is support
soc_is support for AM43x family of SoC's. Only variant now is AM437x,
it is made as a subclass of AM43x.
Signed-off-by: Afzal Mohammed <afzal@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/soc.h')
-rw-r--r-- | arch/arm/mach-omap2/soc.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h index 197cc16870d9..3cefc492b758 100644 --- a/arch/arm/mach-omap2/soc.h +++ b/arch/arm/mach-omap2/soc.h | |||
@@ -96,6 +96,15 @@ | |||
96 | # endif | 96 | # endif |
97 | #endif | 97 | #endif |
98 | 98 | ||
99 | #ifdef CONFIG_SOC_AM43XX | ||
100 | # ifdef OMAP_NAME | ||
101 | # undef MULTI_OMAP2 | ||
102 | # define MULTI_OMAP2 | ||
103 | # else | ||
104 | # define OMAP_NAME am43xx | ||
105 | # endif | ||
106 | #endif | ||
107 | |||
99 | /* | 108 | /* |
100 | * Omap device type i.e. EMU/HS/TST/GP/BAD | 109 | * Omap device type i.e. EMU/HS/TST/GP/BAD |
101 | */ | 110 | */ |
@@ -187,6 +196,7 @@ IS_OMAP_CLASS(44xx, 0x44) | |||
187 | IS_AM_CLASS(35xx, 0x35) | 196 | IS_AM_CLASS(35xx, 0x35) |
188 | IS_OMAP_CLASS(54xx, 0x54) | 197 | IS_OMAP_CLASS(54xx, 0x54) |
189 | IS_AM_CLASS(33xx, 0x33) | 198 | IS_AM_CLASS(33xx, 0x33) |
199 | IS_AM_CLASS(43xx, 0x43) | ||
190 | 200 | ||
191 | IS_TI_CLASS(81xx, 0x81) | 201 | IS_TI_CLASS(81xx, 0x81) |
192 | 202 | ||
@@ -202,6 +212,7 @@ IS_OMAP_SUBCLASS(543x, 0x543) | |||
202 | IS_TI_SUBCLASS(816x, 0x816) | 212 | IS_TI_SUBCLASS(816x, 0x816) |
203 | IS_TI_SUBCLASS(814x, 0x814) | 213 | IS_TI_SUBCLASS(814x, 0x814) |
204 | IS_AM_SUBCLASS(335x, 0x335) | 214 | IS_AM_SUBCLASS(335x, 0x335) |
215 | IS_AM_SUBCLASS(437x, 0x437) | ||
205 | 216 | ||
206 | #define cpu_is_omap24xx() 0 | 217 | #define cpu_is_omap24xx() 0 |
207 | #define cpu_is_omap242x() 0 | 218 | #define cpu_is_omap242x() 0 |
@@ -214,6 +225,8 @@ IS_AM_SUBCLASS(335x, 0x335) | |||
214 | #define soc_is_am35xx() 0 | 225 | #define soc_is_am35xx() 0 |
215 | #define soc_is_am33xx() 0 | 226 | #define soc_is_am33xx() 0 |
216 | #define soc_is_am335x() 0 | 227 | #define soc_is_am335x() 0 |
228 | #define soc_is_am43xx() 0 | ||
229 | #define soc_is_am437x() 0 | ||
217 | #define cpu_is_omap44xx() 0 | 230 | #define cpu_is_omap44xx() 0 |
218 | #define cpu_is_omap443x() 0 | 231 | #define cpu_is_omap443x() 0 |
219 | #define cpu_is_omap446x() 0 | 232 | #define cpu_is_omap446x() 0 |
@@ -341,6 +354,13 @@ IS_OMAP_TYPE(3430, 0x3430) | |||
341 | # define soc_is_am335x() is_am335x() | 354 | # define soc_is_am335x() is_am335x() |
342 | #endif | 355 | #endif |
343 | 356 | ||
357 | #ifdef CONFIG_SOC_AM43XX | ||
358 | # undef soc_is_am43xx | ||
359 | # undef soc_is_am437x | ||
360 | # define soc_is_am43xx() is_am43xx() | ||
361 | # define soc_is_am437x() is_am437x() | ||
362 | #endif | ||
363 | |||
344 | # if defined(CONFIG_ARCH_OMAP4) | 364 | # if defined(CONFIG_ARCH_OMAP4) |
345 | # undef cpu_is_omap44xx | 365 | # undef cpu_is_omap44xx |
346 | # undef cpu_is_omap443x | 366 | # undef cpu_is_omap443x |
@@ -398,6 +418,9 @@ IS_OMAP_TYPE(3430, 0x3430) | |||
398 | #define AM335X_REV_ES2_0 (AM335X_CLASS | (0x1 << 8)) | 418 | #define AM335X_REV_ES2_0 (AM335X_CLASS | (0x1 << 8)) |
399 | #define AM335X_REV_ES2_1 (AM335X_CLASS | (0x2 << 8)) | 419 | #define AM335X_REV_ES2_1 (AM335X_CLASS | (0x2 << 8)) |
400 | 420 | ||
421 | #define AM437X_CLASS 0x43700000 | ||
422 | #define AM437X_REV_ES1_0 AM437X_CLASS | ||
423 | |||
401 | #define OMAP443X_CLASS 0x44300044 | 424 | #define OMAP443X_CLASS 0x44300044 |
402 | #define OMAP4430_REV_ES1_0 (OMAP443X_CLASS | (0x10 << 8)) | 425 | #define OMAP4430_REV_ES1_0 (OMAP443X_CLASS | (0x10 << 8)) |
403 | #define OMAP4430_REV_ES2_0 (OMAP443X_CLASS | (0x20 << 8)) | 426 | #define OMAP4430_REV_ES2_0 (OMAP443X_CLASS | (0x20 << 8)) |