From patchwork Mon Nov 16 10:28:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Lapin X-Patchwork-Id: 60241 X-Patchwork-Delegate: tony@atomide.com 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 nAGASX4o003958 for ; Mon, 16 Nov 2009 10:28:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751181AbZKPK20 (ORCPT ); Mon, 16 Nov 2009 05:28:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751447AbZKPK20 (ORCPT ); Mon, 16 Nov 2009 05:28:26 -0500 Received: from ey-out-2122.google.com ([74.125.78.24]:49032 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750987AbZKPK20 (ORCPT ); Mon, 16 Nov 2009 05:28:26 -0500 Received: by ey-out-2122.google.com with SMTP id 9so1910522eyd.19 for ; Mon, 16 Nov 2009 02:28:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type; bh=kMOO+x+QrVwnY9+ywY+QD48jMnjiPsP4yFnN5EYDfow=; b=WCFxAmofktb+8kTU7U1z7fjlRKnDy+idPwKbDV2rMr9PAjym1zYxpKdwj5o4ig6MVe uSp8IX60F5DoOig5iy7cgrio7WMUoQF9xkDSuyKntyn6s0a81pBqNwGpXeC2LTf5/Vpc XZJJZtpBh9+Jp9MBthjqNGEI84Uig+plNA8uQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=Q3qPPCUL9afS0kwKR34El8Bbas7b8L3rcsd3syHchY7nl7yfl7RR8pRrVd3KrNi6WW pNnLb68KtCUezMGvmlb/f5w+8T7xq2Lmv2Q3L1L06pqBv56PZ85OUmsxZ0v44Rn5uk59 5XVoUjLNqQ/PMRcuk3l76K3Z6iUPeEsZta2xI= MIME-Version: 1.0 Received: by 10.213.26.140 with SMTP id e12mr1748714ebc.0.1258367310637; Mon, 16 Nov 2009 02:28:30 -0800 (PST) Date: Mon, 16 Nov 2009 13:28:30 +0300 Message-ID: <48239d390911160228y61e3c3dbk11b7a819f266b4bd@mail.gmail.com> Subject: OMAP3515 vs 3525 inversion From: Sergey Lapin To: linux-omap@vger.kernel.org Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From 93ac9c6b2dccb0cedb28414612ed2b1b77537dec Mon Sep 17 00:00:00 2001 From: Sergey Lapin 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 --- 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