From patchwork Thu Jul 8 09:38:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 110807 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 o689c5Gq005097 for ; Thu, 8 Jul 2010 09:38:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755694Ab0GHJiE (ORCPT ); Thu, 8 Jul 2010 05:38:04 -0400 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:56780 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755670Ab0GHJiD (ORCPT ); Thu, 8 Jul 2010 05:38:03 -0400 Received: from muru.com ([72.249.23.125] helo=baageli.muru.com) by mho-02-ewr.mailhop.org with esmtpa (Exim 4.68) (envelope-from ) id 1OWnYQ-0009XG-LN; Thu, 08 Jul 2010 09:38:02 +0000 X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 72.249.23.125 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX18sqv93D/I4bbPr0RrhqDgY Subject: [PATCH 4/5] omap: Remove old omap3_has_ macros To: linux-omap@vger.kernel.org From: Tony Lindgren Cc: nm@ti.com Date: Thu, 08 Jul 2010 12:38:01 +0300 Message-ID: <20100708093801.16352.93269.stgit@baageli.muru.com> In-Reply-To: <20100708093405.16352.11814.stgit@baageli.muru.com> References: <20100708093405.16352.11814.stgit@baageli.muru.com> User-Agent: StGit/0.15 MIME-Version: 1.0 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]); Thu, 08 Jul 2010 09:38:06 +0000 (UTC) diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 11184cf..123ed1e 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -31,9 +31,6 @@ static struct omap_chip_id omap_chip; static unsigned int omap_revision; static u32 omap_features; -/* REVISIT: Get rid of omap3_features */ -u32 omap3_features; - unsigned int omap_rev(void) { return omap_revision; @@ -186,14 +183,14 @@ u32 omap3_has_feature(u32 feat_mask) #define OMAP3_CHECK_FEATURE(status,feat) \ if (((status & OMAP3_ ##feat## _MASK) \ >> OMAP3_ ##feat## _SHIFT) != FEAT_ ##feat## _NONE) { \ - omap3_features |= OMAP3_HAS_ ##feat; \ + omap_features |= OMAP3_HAS_ ##feat; \ } static void __init omap3_check_features(void) { u32 status; - omap3_features = 0; + omap_features = 0; status = omap_ctrl_readl(OMAP3_CONTROL_OMAP_STATUS); @@ -203,18 +200,15 @@ static void __init omap3_check_features(void) OMAP3_CHECK_FEATURE(status, NEON); OMAP3_CHECK_FEATURE(status, ISP); if (cpu_is_omap3630()) - omap3_features |= OMAP3_HAS_192MHZ_CLK; + omap_features |= OMAP3_HAS_192MHZ_CLK; if (!cpu_is_omap3505() && !cpu_is_omap3517()) - omap3_features |= OMAP3_HAS_IO_WAKEUP; + omap_features |= OMAP3_HAS_IO_WAKEUP; /* * TODO: Get additional info (where applicable) * e.g. Size of L2 cache. */ - /* REVISIT: Get rid of omap3_features */ - omap_features = omap3_features; - omap_init_features(omap3_has_feature); } diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h index efee323..96eac4d 100644 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h @@ -439,8 +439,6 @@ void omap2_check_revision(void); /* * Runtime detection of OMAP3 features */ -extern u32 omap3_features; - #define OMAP3_HAS_L2CACHE BIT(0) #define OMAP3_HAS_IVA BIT(1) #define OMAP3_HAS_SGX BIT(2) @@ -449,18 +447,4 @@ extern u32 omap3_features; #define OMAP3_HAS_192MHZ_CLK BIT(5) #define OMAP3_HAS_IO_WAKEUP BIT(6) -#define OMAP3_HAS_FEATURE(feat,flag) \ -static inline unsigned int omap3_has_ ##feat(void) \ -{ \ - return (omap3_features & OMAP3_HAS_ ##flag); \ -} \ - -OMAP3_HAS_FEATURE(l2cache, L2CACHE) -OMAP3_HAS_FEATURE(sgx, SGX) -OMAP3_HAS_FEATURE(iva, IVA) -OMAP3_HAS_FEATURE(neon, NEON) -OMAP3_HAS_FEATURE(isp, ISP) -OMAP3_HAS_FEATURE(192mhz_clk, 192MHZ_CLK) -OMAP3_HAS_FEATURE(io_wakeup, IO_WAKEUP) - #endif