From patchwork Mon Nov 23 16:19:11 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Sanjeev Premi <premi@ti.com>
X-Patchwork-Id: 62207
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nANGJako015927
	for <patchwork-omap@patchwork.kernel.org>;
	Mon, 23 Nov 2009 16:19:36 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755665AbZKWQT2 (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Mon, 23 Nov 2009 11:19:28 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755643AbZKWQT2
	(ORCPT <rfc822;linux-omap-outgoing>);
	Mon, 23 Nov 2009 11:19:28 -0500
Received: from bear.ext.ti.com ([192.94.94.41]:60349 "EHLO bear.ext.ti.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755489AbZKWQT2 (ORCPT <rfc822;linux-omap@vger.kernel.org>);
	Mon, 23 Nov 2009 11:19:28 -0500
Received: from dbdp31.itg.ti.com ([172.24.170.98])
	by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id nANGJPT1018345
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Mon, 23 Nov 2009 10:19:27 -0600
Received: from localhost.localdomain (localhost [127.0.0.1])
	by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id nANGJM7U003730;
	Mon, 23 Nov 2009 21:49:23 +0530 (IST)
From: Sanjeev Premi <premi@ti.com>
To: linux-omap@vger.kernel.org
Cc: Sergey Lapin <slapin@ossfans.org>, Sanjeev Premi <premi@ti.com>
Subject: [PATCH] OMAP3: id code detection 3525 vs 3515
Date: Mon, 23 Nov 2009 21:49:11 +0530
Message-Id: <1258993162-12635-1-git-send-email-premi@ti.com>
X-Mailer: git-send-email 1.6.2.2
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org


diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index f48a4b2..4fad192 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -277,10 +277,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 {