Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ded884c2 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'for_3.5/cleanup/am3xxx-cpu-is-leftovers' of... 

Merge branch 'for_3.5/cleanup/am3xxx-cpu-is-leftovers' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes
parents 45647476 96f39949

arch/arm/mach-omap2/clock3xxx_data.c

+1 −1
Original line number Diff line number Diff line
@@ -3514,7 +3514,7 @@ int __init omap3xxx_clk_init(void) 
	struct omap_clk *c;

	u32 cpu_clkflg = 0;



	if (cpu_is_omap3517()) {

	if (soc_is_am35xx()) {

		cpu_mask = RATE_IN_34XX;

		cpu_clkflg = CK_AM35XX;

	} else if (cpu_is_omap3630()) {

arch/arm/plat-omap/include/plat/cpu.h

+0 −33
Original line number Diff line number Diff line
@@ -252,8 +252,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)
@@ -277,8 +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

#define cpu_is_omap730()		0
@@ -293,12 +289,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
@@ -350,12 +340,6 @@ 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
@@ -363,19 +347,6 @@ IS_OMAP_TYPE(3517, 0x3517) 
# 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()
@@ -424,10 +395,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))