The 3505 check is now unused and can be removed. There are no longer any cpu_is_* checks that depend on specific IP detection. Signed-off-by: Kevin Hilman <khilman@xxxxxx> --- arch/arm/plat-omap/include/plat/cpu.h | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h index bcad3dc..8d858c2 100644 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h @@ -251,8 +251,7 @@ IS_AM_SUBCLASS(335x, 0x335) * cpu_is_omap2430(): True for OMAP2430 * cpu_is_omap3430(): True for OMAP3430 * cpu_is_omap4430(): True for OMAP4430 - * cpu_is_omap3505(): True for OMAP3505 - * cpu_is_omap3517(): True for OMAP3517 + * cpu_is_omap3517(): True for AM35x: OMAP3517, OMAP3505 */ #define GET_OMAP_TYPE ((omap_rev() >> 16) & 0xffff) @@ -276,7 +275,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 @@ -293,7 +291,6 @@ IS_OMAP_TYPE(3517, 0x3517) #define cpu_is_omap2423() 0 #define cpu_is_omap2430() 0 #define cpu_is_omap3530() 0 -#define cpu_is_omap3505() 0 #define cpu_is_omap3517() 0 #define cpu_is_omap3430() 0 #define cpu_is_omap4430() 0 @@ -348,7 +345,6 @@ IS_OMAP_TYPE(3517, 0x3517) #if defined(CONFIG_ARCH_OMAP3) # undef cpu_is_omap3430 # undef cpu_is_omap3530 -# undef cpu_is_omap3505 # undef cpu_is_omap3517 # undef cpu_is_ti81xx # undef cpu_is_ti816x @@ -358,8 +354,6 @@ IS_OMAP_TYPE(3517, 0x3517) # define cpu_is_omap3430() is_omap3430() # 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() -- 1.7.8.2 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
