diff mbox

OMAP3515 vs 3525 inversion

Message ID 48239d390911160228y61e3c3dbk11b7a819f266b4bd@mail.gmail.com (mailing list archive)
State Superseded, archived
Delegated to: Tony Lindgren
Headers show

Commit Message

Sergey Lapin Nov. 16, 2009, 10:28 a.m. UTC 
None
diff mbox

Patch

From 93ac9c6b2dccb0cedb28414612ed2b1b77537dec Mon Sep 17 00:00:00 2001
From: Sergey Lapin <slapin@ossfans.org>
Date: Mon, 16 Nov 2009 13:23:45 +0300
Subject: [PATCH] OMAP3: id code detection 3525 vs 3515

In current tree CPU detection of 3525 vs 3515 is reversed


Signed-off-by: Sergey Lapin <slapin@ossfans.org>
---
 arch/arm/mach-omap2/id.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index f48a4b2..2f97577 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -278,11 +278,11 @@  void __init omap3_cpuinfo(void)
 		/* OMAP3430, OMAP3525, OMAP3515, OMAP3503 devices */
 		strcpy(cpu_name, "OMAP3430/3530");
 	} else if (omap3_has_sgx()) {
-		omap_revision = OMAP3525_REV(rev);
-		strcpy(cpu_name, "OMAP3525");
-	} else if (omap3_has_iva()) {
 		omap_revision = OMAP3515_REV(rev);
 		strcpy(cpu_name, "OMAP3515");
+	} else if (omap3_has_iva()) {
+		omap_revision = OMAP3525_REV(rev);
+		strcpy(cpu_name, "OMAP3525");
 	} else {
 		omap_revision = OMAP3503_REV(rev);
 		strcpy(cpu_name, "OMAP3503");
-- 
1.6.5