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

Commit 0712fb39 authored Dec 11, 2009 by Sergey Lapin Committed by Tony Lindgren Dec 11, 2009

omap3: id code detection 3525 vs 3515



The runtime detection of OMAP3515 and OMAP3525
was reversed.

Signed-off-by: Sergey Lapin <slapin@ossfans.org>
Signed-off-by: Sanjeev Premi <premi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

parent 860fc976

arch/arm/mach-omap2/id.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -302,10 +302,10 @@ void __init omap3_cpuinfo(void)
		} else if (omap3_has_iva() && omap3_has_sgx()) {
		/* OMAP3430, OMAP3525, OMAP3515, OMAP3503 devices */
		strcpy(cpu_name, "OMAP3430/3530");
		} else if (omap3_has_sgx()) {
		} else if (omap3_has_iva()) {
		omap_revision = OMAP3525_REV(rev);
		strcpy(cpu_name, "OMAP3525");
		} else if (omap3_has_iva()) {
		} else if (omap3_has_sgx()) {
		omap_revision = OMAP3515_REV(rev);
		strcpy(cpu_name, "OMAP3515");
		} else {

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -395,11 +395,11 @@ IS_OMAP_TYPE(3517, 0x3517)
		(!omap3_has_iva()) && \
		(!omap3_has_sgx()))
		# define cpu_is_omap3515() (cpu_is_omap3430() && \
		(omap3_has_iva()) && \
		(!omap3_has_sgx()))
		(!omap3_has_iva()) && \
		(omap3_has_sgx()))
		# define cpu_is_omap3525() (cpu_is_omap3430() && \
		(omap3_has_sgx()) && \
		(!omap3_has_iva()))
		(!omap3_has_sgx()) && \
		(omap3_has_iva()))
		# define cpu_is_omap3530() (cpu_is_omap3430())
		# define cpu_is_omap3505() is_omap3505()
		# define cpu_is_omap3517() is_omap3517()