diff options
author | Kevin Hilman <khilman@ti.com> | 2012-05-11 19:38:11 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@ti.com> | 2012-05-25 18:48:48 -0400 |
commit | 96f3994929c05a21d757a83613d2710b780ea2b4 (patch) | |
tree | 1c3da4020489df9d0451d80a652bf04c4268c34e /arch/arm | |
parent | 00633d7c7a0243940fc616bee573bcf497db79b9 (diff) |
ARM: OMAP: SoC detection: remove unused cpu_is macros
Remove multiple unused cpu_is_omap35xx macros.
In particular, the cpu_is_omap35* macros for 3503, 3515, 3525 are removed
because they are using omap_has_* feature checks and we want to
remove specific feature detection from SoC family detection.
There are no longer any cpu_is_* checks that depend on specific IP
detection.
Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
Tested-by: Mark A. Greer <mgreer@animalcreek.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/plat-omap/include/plat/cpu.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h index 4bdf14ec6747..0f8a201cee68 100644 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h | |||
@@ -250,8 +250,6 @@ IS_AM_SUBCLASS(335x, 0x335) | |||
250 | * cpu_is_omap2423(): True for OMAP2423 | 250 | * cpu_is_omap2423(): True for OMAP2423 |
251 | * cpu_is_omap2430(): True for OMAP2430 | 251 | * cpu_is_omap2430(): True for OMAP2430 |
252 | * cpu_is_omap3430(): True for OMAP3430 | 252 | * cpu_is_omap3430(): True for OMAP3430 |
253 | * cpu_is_omap3505(): True for OMAP3505 | ||
254 | * cpu_is_omap3517(): True for OMAP3517 | ||
255 | */ | 253 | */ |
256 | #define GET_OMAP_TYPE ((omap_rev() >> 16) & 0xffff) | 254 | #define GET_OMAP_TYPE ((omap_rev() >> 16) & 0xffff) |
257 | 255 | ||
@@ -275,8 +273,6 @@ IS_OMAP_TYPE(2422, 0x2422) | |||
275 | IS_OMAP_TYPE(2423, 0x2423) | 273 | IS_OMAP_TYPE(2423, 0x2423) |
276 | IS_OMAP_TYPE(2430, 0x2430) | 274 | IS_OMAP_TYPE(2430, 0x2430) |
277 | IS_OMAP_TYPE(3430, 0x3430) | 275 | IS_OMAP_TYPE(3430, 0x3430) |
278 | IS_OMAP_TYPE(3505, 0x3517) | ||
279 | IS_OMAP_TYPE(3517, 0x3517) | ||
280 | 276 | ||
281 | #define cpu_is_omap310() 0 | 277 | #define cpu_is_omap310() 0 |
282 | #define cpu_is_omap730() 0 | 278 | #define cpu_is_omap730() 0 |
@@ -291,12 +287,6 @@ IS_OMAP_TYPE(3517, 0x3517) | |||
291 | #define cpu_is_omap2422() 0 | 287 | #define cpu_is_omap2422() 0 |
292 | #define cpu_is_omap2423() 0 | 288 | #define cpu_is_omap2423() 0 |
293 | #define cpu_is_omap2430() 0 | 289 | #define cpu_is_omap2430() 0 |
294 | #define cpu_is_omap3503() 0 | ||
295 | #define cpu_is_omap3515() 0 | ||
296 | #define cpu_is_omap3525() 0 | ||
297 | #define cpu_is_omap3530() 0 | ||
298 | #define cpu_is_omap3505() 0 | ||
299 | #define cpu_is_omap3517() 0 | ||
300 | #define cpu_is_omap3430() 0 | 290 | #define cpu_is_omap3430() 0 |
301 | #define cpu_is_omap3630() 0 | 291 | #define cpu_is_omap3630() 0 |
302 | 292 | ||
@@ -348,31 +338,12 @@ IS_OMAP_TYPE(3517, 0x3517) | |||
348 | 338 | ||
349 | #if defined(CONFIG_ARCH_OMAP3) | 339 | #if defined(CONFIG_ARCH_OMAP3) |
350 | # undef cpu_is_omap3430 | 340 | # undef cpu_is_omap3430 |
351 | # undef cpu_is_omap3503 | ||
352 | # undef cpu_is_omap3515 | ||
353 | # undef cpu_is_omap3525 | ||
354 | # undef cpu_is_omap3530 | ||
355 | # undef cpu_is_omap3505 | ||
356 | # undef cpu_is_omap3517 | ||
357 | # undef cpu_is_ti81xx | 341 | # undef cpu_is_ti81xx |
358 | # undef cpu_is_ti816x | 342 | # undef cpu_is_ti816x |
359 | # undef cpu_is_ti814x | 343 | # undef cpu_is_ti814x |
360 | # undef cpu_is_am33xx | 344 | # undef cpu_is_am33xx |
361 | # undef cpu_is_am335x | 345 | # undef cpu_is_am335x |
362 | # define cpu_is_omap3430() is_omap3430() | 346 | # define cpu_is_omap3430() is_omap3430() |
363 | # define cpu_is_omap3503() (cpu_is_omap3430() && \ | ||
364 | (!omap3_has_iva()) && \ | ||
365 | (!omap3_has_sgx())) | ||
366 | # define cpu_is_omap3515() (cpu_is_omap3430() && \ | ||
367 | (!omap3_has_iva()) && \ | ||
368 | (omap3_has_sgx())) | ||
369 | # define cpu_is_omap3525() (cpu_is_omap3430() && \ | ||
370 | (!omap3_has_sgx()) && \ | ||
371 | (omap3_has_iva())) | ||
372 | # define cpu_is_omap3530() (cpu_is_omap3430()) | ||
373 | # define cpu_is_omap3517() is_omap3517() | ||
374 | # define cpu_is_omap3505() (cpu_is_omap3517() && \ | ||
375 | !omap3_has_sgx()) | ||
376 | # undef cpu_is_omap3630 | 347 | # undef cpu_is_omap3630 |
377 | # define cpu_is_omap3630() is_omap363x() | 348 | # define cpu_is_omap3630() is_omap363x() |
378 | # define cpu_is_ti81xx() is_ti81xx() | 349 | # define cpu_is_ti81xx() is_ti81xx() |
@@ -420,10 +391,6 @@ IS_OMAP_TYPE(3517, 0x3517) | |||
420 | #define OMAP3630_REV_ES1_1 (OMAP363X_CLASS | (0x1 << 8)) | 391 | #define OMAP3630_REV_ES1_1 (OMAP363X_CLASS | (0x1 << 8)) |
421 | #define OMAP3630_REV_ES1_2 (OMAP363X_CLASS | (0x2 << 8)) | 392 | #define OMAP3630_REV_ES1_2 (OMAP363X_CLASS | (0x2 << 8)) |
422 | 393 | ||
423 | #define OMAP3517_CLASS 0x35170034 | ||
424 | #define OMAP3517_REV_ES1_0 OMAP3517_CLASS | ||
425 | #define OMAP3517_REV_ES1_1 (OMAP3517_CLASS | (0x1 << 8)) | ||
426 | |||
427 | #define TI816X_CLASS 0x81600034 | 394 | #define TI816X_CLASS 0x81600034 |
428 | #define TI8168_REV_ES1_0 TI816X_CLASS | 395 | #define TI8168_REV_ES1_0 TI816X_CLASS |
429 | #define TI8168_REV_ES1_1 (TI816X_CLASS | (0x1 << 8)) | 396 | #define TI8168_REV_ES1_1 (TI816X_CLASS | (0x1 << 8)) |