From patchwork Wed Jun 23 02:16:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 107531 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 o5N2GU9A012076 for ; Wed, 23 Jun 2010 02:16:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751039Ab0FWCQ3 (ORCPT ); Tue, 22 Jun 2010 22:16:29 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:45682 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751152Ab0FWCQ1 (ORCPT ); Tue, 22 Jun 2010 22:16:27 -0400 Received: from dlep33.itg.ti.com ([157.170.170.112]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o5N2GJJu026810 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 22 Jun 2010 21:16:20 -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 o5N2GJAK023615; Tue, 22 Jun 2010 21:16:19 -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 o5N2GIP15226; Tue, 22 Jun 2010 21:16:18 -0500 (CDT) Received: by senorita (Postfix, from userid 1000) id B5AEEC258; 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 3/9] omap: generic: introduce a single check_revision Date: Tue, 22 Jun 2010 21:16:09 -0500 Message-Id: <1277259375-18521-4-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:30 +0000 (UTC) diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c index e4d8680..4f9ee73 100644 --- a/arch/arm/mach-omap1/io.c +++ b/arch/arm/mach-omap1/io.c @@ -20,7 +20,6 @@ #include "clock.h" -extern void omap1_check_revision(void); extern void omap_sram_init(void); /* @@ -102,7 +101,7 @@ void __init omap1_map_common_io(void) /* We want to check CPU revision early for cpu_is_omapxxxx() macros. * IO space mapping must be initialized before we can do that. */ - omap1_check_revision(); + omap_check_revision(); #if defined (CONFIG_ARCH_OMAP730) || defined (CONFIG_ARCH_OMAP850) if (cpu_is_omap7xx()) { diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 4e1f53d..eeb0e30 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -238,7 +238,7 @@ static void __init _omap2_map_common_io(void) local_flush_tlb_all(); flush_cache_all(); - omap2_check_revision(); + omap_check_revision(); omap_sram_init(); } diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index fca73cd..538e170 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -89,6 +89,18 @@ void __init omap_reserve(void) omap_vram_reserve_sdram_lmb(); } +void __init omap_check_revision() +{ +#ifdef CONFIG_ARCH_OMAP1 + if (cpu_is_omap7xx() || cpu_is_omap15xx() || cpu_is_omap16xx()) + omap1_check_revision(); +#endif +#ifdef CONFIG_ARCH_OMAP2PLUS + if (cpu_is_omap24xx() || cpu_is_omap34xx() || cpu_is_omap44xx()) + omap2_check_revision(); +#endif +} + /* * 32KHz clocksource ... always available, on pretty most chips except * OMAP 730 and 1510. Other timers could be used as clocksources, with diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h index 7514174..5f12a0b 100644 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h @@ -431,7 +431,18 @@ IS_OMAP_TYPE(3517, 0x3517) int omap_chip_is(struct omap_chip_id oci); -void omap2_check_revision(void); +#ifdef CONFIG_ARCH_OMAP2PLUS +extern void omap2_check_revision(void); +#else +static inline void omap2_check_revision(void) {} +#endif + +#ifdef CONFIG_ARCH_OMAP1 +extern void omap1_check_revision(void); +#else +static inline void omap1_check_revision(void) {} +#endif +void omap_check_revision(void); /* * Runtime detection of OMAP3 features