forked from Minki/linux
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>
This commit is contained in:
parent
00633d7c7a
commit
96f3994929
@ -250,8 +250,6 @@ IS_AM_SUBCLASS(335x, 0x335)
|
||||
* cpu_is_omap2423(): True for OMAP2423
|
||||
* cpu_is_omap2430(): True for OMAP2430
|
||||
* cpu_is_omap3430(): True for OMAP3430
|
||||
* cpu_is_omap3505(): True for OMAP3505
|
||||
* cpu_is_omap3517(): True for OMAP3517
|
||||
*/
|
||||
#define GET_OMAP_TYPE ((omap_rev() >> 16) & 0xffff)
|
||||
|
||||
@ -275,8 +273,6 @@ IS_OMAP_TYPE(2422, 0x2422)
|
||||
IS_OMAP_TYPE(2423, 0x2423)
|
||||
IS_OMAP_TYPE(2430, 0x2430)
|
||||
IS_OMAP_TYPE(3430, 0x3430)
|
||||
IS_OMAP_TYPE(3505, 0x3517)
|
||||
IS_OMAP_TYPE(3517, 0x3517)
|
||||
|
||||
#define cpu_is_omap310() 0
|
||||
#define cpu_is_omap730() 0
|
||||
@ -291,12 +287,6 @@ IS_OMAP_TYPE(3517, 0x3517)
|
||||
#define cpu_is_omap2422() 0
|
||||
#define cpu_is_omap2423() 0
|
||||
#define cpu_is_omap2430() 0
|
||||
#define cpu_is_omap3503() 0
|
||||
#define cpu_is_omap3515() 0
|
||||
#define cpu_is_omap3525() 0
|
||||
#define cpu_is_omap3530() 0
|
||||
#define cpu_is_omap3505() 0
|
||||
#define cpu_is_omap3517() 0
|
||||
#define cpu_is_omap3430() 0
|
||||
#define cpu_is_omap3630() 0
|
||||
|
||||
@ -348,31 +338,12 @@ IS_OMAP_TYPE(3517, 0x3517)
|
||||
|
||||
#if defined(CONFIG_ARCH_OMAP3)
|
||||
# undef cpu_is_omap3430
|
||||
# undef cpu_is_omap3503
|
||||
# undef cpu_is_omap3515
|
||||
# undef cpu_is_omap3525
|
||||
# undef cpu_is_omap3530
|
||||
# undef cpu_is_omap3505
|
||||
# undef cpu_is_omap3517
|
||||
# undef cpu_is_ti81xx
|
||||
# undef cpu_is_ti816x
|
||||
# undef cpu_is_ti814x
|
||||
# undef cpu_is_am33xx
|
||||
# undef cpu_is_am335x
|
||||
# define cpu_is_omap3430() is_omap3430()
|
||||
# define cpu_is_omap3503() (cpu_is_omap3430() && \
|
||||
(!omap3_has_iva()) && \
|
||||
(!omap3_has_sgx()))
|
||||
# define cpu_is_omap3515() (cpu_is_omap3430() && \
|
||||
(!omap3_has_iva()) && \
|
||||
(omap3_has_sgx()))
|
||||
# define cpu_is_omap3525() (cpu_is_omap3430() && \
|
||||
(!omap3_has_sgx()) && \
|
||||
(omap3_has_iva()))
|
||||
# define cpu_is_omap3530() (cpu_is_omap3430())
|
||||
# define cpu_is_omap3517() is_omap3517()
|
||||
# define cpu_is_omap3505() (cpu_is_omap3517() && \
|
||||
!omap3_has_sgx())
|
||||
# undef cpu_is_omap3630
|
||||
# define cpu_is_omap3630() is_omap363x()
|
||||
# define cpu_is_ti81xx() is_ti81xx()
|
||||
@ -420,10 +391,6 @@ IS_OMAP_TYPE(3517, 0x3517)
|
||||
#define OMAP3630_REV_ES1_1 (OMAP363X_CLASS | (0x1 << 8))
|
||||
#define OMAP3630_REV_ES1_2 (OMAP363X_CLASS | (0x2 << 8))
|
||||
|
||||
#define OMAP3517_CLASS 0x35170034
|
||||
#define OMAP3517_REV_ES1_0 OMAP3517_CLASS
|
||||
#define OMAP3517_REV_ES1_1 (OMAP3517_CLASS | (0x1 << 8))
|
||||
|
||||
#define TI816X_CLASS 0x81600034
|
||||
#define TI8168_REV_ES1_0 TI816X_CLASS
|
||||
#define TI8168_REV_ES1_1 (TI816X_CLASS | (0x1 << 8))
|
||||
|
Loading…
Reference in New Issue
Block a user