From patchwork Wed Dec 9 11:02:53 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sanjeev Premi X-Patchwork-Id: 65973 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 nB9B30Qq021752 for ; Wed, 9 Dec 2009 11:03:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755082AbZLILCw (ORCPT ); Wed, 9 Dec 2009 06:02:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755048AbZLILCw (ORCPT ); Wed, 9 Dec 2009 06:02:52 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:45889 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754861AbZLILCv (ORCPT ); Wed, 9 Dec 2009 06:02:51 -0500 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id nB9B2tX5029960 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 9 Dec 2009 05:02:57 -0600 Received: from localhost.localdomain (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id nB9B2rRj007384; Wed, 9 Dec 2009 16:32:54 +0530 (IST) From: Sanjeev Premi To: linux-omap@vger.kernel.org Cc: Sanjeev Premi Subject: [PATCH] AM35xx: Update the macro names Date: Wed, 9 Dec 2009 16:32:53 +0530 Message-Id: <1260356573-25242-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: 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 4fad192..9ab97ce 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -233,7 +233,7 @@ void __init omap3_check_revision(void) case 0xb868: /* Handle OMAP35xx/AM35xx devices * - * Set the device to be OMAP3505 here. Actual device + * Set the device to be AM3505/OMAP3505 here. Actual device * is identified later based on the features. */ omap_revision = OMAP3505_REV(rev); @@ -263,7 +263,7 @@ void __init omap3_cpuinfo(void) */ if (cpu_is_omap3630()) { strcpy(cpu_name, "OMAP3630"); - } else if (cpu_is_omap3505()) { + } else if (cpu_is_am3505()) { /* * AM35xx devices */ diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h index 2e17890..8dd8801 100644 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h @@ -399,8 +399,8 @@ IS_OMAP_TYPE(3517, 0x3517) (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() +# define cpu_is_am3505() is_omap3505() +# define cpu_is_am3517() is_omap3517() # undef cpu_is_omap3630 # define cpu_is_omap3630() is_omap363x() #endif