From patchwork Wed Jun 23 02:16:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 107535 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5N2GYJ3012114 for ; Wed, 23 Jun 2010 02:16:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751360Ab0FWCQb (ORCPT ); Tue, 22 Jun 2010 22:16:31 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:45157 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751415Ab0FWCQ1 (ORCPT ); Tue, 22 Jun 2010 22:16:27 -0400 Received: from dlep33.itg.ti.com ([157.170.170.112]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id o5N2GJfv021647 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 22 Jun 2010 21:16:19 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id o5N2GIxb023614; Tue, 22 Jun 2010 21:16:18 -0500 (CDT) Received: from senorita (senorita.am.dhcp.ti.com [128.247.74.250]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id o5N2GIP15224; Tue, 22 Jun 2010 21:16:18 -0500 (CDT) Received: by senorita (Postfix, from userid 1000) id B7A8CC253; Tue, 22 Jun 2010 21:16:17 -0500 (CDT) From: Nishanth Menon To: linux-omap Cc: Venkatraman S , Senthilvadivu Guruswamy , Tony Lindgren , Nishanth Menon , Angelo Arrifano , "Zebediah C. McClure" , Alistair Buxton , Paul Walmsley , Sanjeev Premi , Santosh Shilimkar , Kevin Hilman , Tomi Valkeinen , Aaro Koskinen , Vikram Pandita , Vishwanath S , linux-omap@vger.kernel.org Subject: [PATCH 5/9] omap: introduce OMAP_SHOW_FEATURE Date: Tue, 22 Jun 2010 21:16:11 -0500 Message-Id: <1277259375-18521-6-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1277259375-18521-1-git-send-email-nm@ti.com> References: <1277259375-18521-1-git-send-email-nm@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 23 Jun 2010 02:16:35 +0000 (UTC) diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index c7bf0e1..809e13a 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -293,10 +293,6 @@ static void __init omap4_check_revision(void) pr_err("Unknown OMAP4 CPU id\n"); } -#define OMAP3_SHOW_FEATURE(feat) \ - if (omap3_has_ ##feat()) \ - printk(#feat" "); - static void __init omap3_cpuinfo(void) { u8 rev = GET_OMAP_REVISION(); @@ -358,12 +354,12 @@ static void __init omap3_cpuinfo(void) /* Print verbose information */ pr_info("%s ES%s (", cpu_name, cpu_rev); - OMAP3_SHOW_FEATURE(l2cache); - OMAP3_SHOW_FEATURE(iva); - OMAP3_SHOW_FEATURE(sgx); - OMAP3_SHOW_FEATURE(neon); - OMAP3_SHOW_FEATURE(isp); - OMAP3_SHOW_FEATURE(192mhz_clk); + OMAP_SHOW_FEATURE(3, l2cache); + OMAP_SHOW_FEATURE(3, iva); + OMAP_SHOW_FEATURE(3, sgx); + OMAP_SHOW_FEATURE(3, neon); + OMAP_SHOW_FEATURE(3, isp); + OMAP_SHOW_FEATURE(3, 192mhz_clk); printk(")\n"); } diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h index c71dbf4..f8ecbc4 100644 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h @@ -450,6 +450,12 @@ static inline unsigned int omap##rev##_has_ ##feat(void) \ return omap##rev##_features & OMAP##rev##_HAS_ ##flag; \ } \ +#define OMAP_SHOW_FEATURE(rev, feat) \ +{ \ + if (omap##rev##_has_ ##feat()) \ + printk(#feat" "); \ +} \ + /* * Runtime detection of OMAP3 features */