diff options
author | Sergey Lapin <slapin@ossfans.org> | 2009-12-11 19:16:37 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-12-11 19:16:37 -0500 |
commit | 0712fb39d7ac045171f26b24b896d58adec04133 (patch) | |
tree | 3cd39199ef29cae97931df1a3c557942b8f1aa14 /arch/arm/mach-omap2/id.c | |
parent | 860fc976321fa690c5cc77a2f66e8d6ea8d52e25 (diff) |
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>
Diffstat (limited to 'arch/arm/mach-omap2/id.c')
-rw-r--r-- | arch/arm/mach-omap2/id.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 3641ba0c16ef..a091b53657b9 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c | |||
@@ -302,10 +302,10 @@ void __init omap3_cpuinfo(void) | |||
302 | } else if (omap3_has_iva() && omap3_has_sgx()) { | 302 | } else if (omap3_has_iva() && omap3_has_sgx()) { |
303 | /* OMAP3430, OMAP3525, OMAP3515, OMAP3503 devices */ | 303 | /* OMAP3430, OMAP3525, OMAP3515, OMAP3503 devices */ |
304 | strcpy(cpu_name, "OMAP3430/3530"); | 304 | strcpy(cpu_name, "OMAP3430/3530"); |
305 | } else if (omap3_has_sgx()) { | 305 | } else if (omap3_has_iva()) { |
306 | omap_revision = OMAP3525_REV(rev); | 306 | omap_revision = OMAP3525_REV(rev); |
307 | strcpy(cpu_name, "OMAP3525"); | 307 | strcpy(cpu_name, "OMAP3525"); |
308 | } else if (omap3_has_iva()) { | 308 | } else if (omap3_has_sgx()) { |
309 | omap_revision = OMAP3515_REV(rev); | 309 | omap_revision = OMAP3515_REV(rev); |
310 | strcpy(cpu_name, "OMAP3515"); | 310 | strcpy(cpu_name, "OMAP3515"); |
311 | } else { | 311 | } else { |