From patchwork Wed Jul 7 17:24:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 110681 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 o67HOSFU013119 for ; Wed, 7 Jul 2010 17:24:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753099Ab0GGRY1 (ORCPT ); Wed, 7 Jul 2010 13:24:27 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:35119 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751394Ab0GGRY0 (ORCPT ); Wed, 7 Jul 2010 13:24:26 -0400 Received: from dlep35.itg.ti.com ([157.170.170.118]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o67HOHnD027807 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 7 Jul 2010 12:24:17 -0500 Received: from dlep26.itg.ti.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id o67HOG5e020494; Wed, 7 Jul 2010 12:24:16 -0500 (CDT) Received: from dlee73.ent.ti.com (localhost [127.0.0.1]) by dlep26.itg.ti.com (8.13.8/8.13.8) with ESMTP id o67HOGSL002893; Wed, 7 Jul 2010 12:24:16 -0500 (CDT) Received: from [128.247.74.250] (128.247.74.250) by dlee73.ent.ti.com (157.170.170.88) with Microsoft SMTP Server id 8.1.358.0; Wed, 7 Jul 2010 12:24:16 -0500 Message-ID: <4C34B840.3060907@ti.com> Date: Wed, 7 Jul 2010 12:24:16 -0500 From: Nishanth Menon User-Agent: Thunderbird 2.0.0.24 (X11/20100411) MIME-Version: 1.0 To: Tony Lindgren CC: linux-omap , Angelo Arrifano , "Zebediah C. McClure" , Alistair Buxton , Grazvydas Ignotas , Paul Walmsley , "Premi, Sanjeev" , "Shilimkar, Santosh" , "Guruswamy, Senthilvadivu" , Kevin Hilman , "DebBarma, Tarun Kanti" , Tomi Valkeinen , Aaro Koskinen , "Pandita, Vikram" , "S, Vishwanath" Subject: Re: [PATCH 3/9 v3] omap: generic: introduce a single check_revision References: <1277483122-3616-1-git-send-email-nm@ti.com> <20100707123633.GT1920@atomide.com> In-Reply-To: <20100707123633.GT1920@atomide.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, 07 Jul 2010 17:24:28 +0000 (UTC) From f72070e575433ad07ed018aef5c43677424003d0 Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Fri, 21 May 2010 12:09:33 -0500 Subject: [PATCH 2/7] omap: generic: introduce a single check_revision Introduce a single omap generic check_revision that routes the request to the right revision of check_revision. Note: OMAP1 and OMAP2+ are not built into a single kernel. Cc: Tony Lindgren Cc: Angelo Arrifano Cc: "Zebediah C. McClure" Cc: Alistair Buxton Cc: Grazvydas Ignotas Cc: Paul Walmsley Cc: Sanjeev Premi Cc: Santosh Shilimkar Cc: Senthilvadivu Gurusamy Cc: Kevin Hilman Cc: Tarun Kanti DebBarma Cc: Tomi Valkeinen Cc: Aaro Koskinen Cc: Vikram Pandita Cc: Vishwanath S Cc: linux-omap@vger.kernel.org Signed-off-by: Nishanth Menon --- arch/arm/mach-omap1/io.c | 1 - arch/arm/mach-omap2/id.c | 2 +- arch/arm/mach-omap2/io.c | 2 +- arch/arm/plat-omap/include/plat/cpu.h | 3 ++- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c index 0ce3fec..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 omap_check_revision(void); extern void omap_sram_init(void); /* diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index c7bf0e1..80f0950 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -371,7 +371,7 @@ static void __init omap3_cpuinfo(void) /* * Try to detect the exact revision of the omap we're running on */ -void __init omap2_check_revision(void) +void __init omap_check_revision(void) { /* * At this point we have an idea about the processor revision set diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index b9ea70b..75883fe 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/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h index 7514174..d25ba40 100644 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h @@ -431,7 +431,8 @@ IS_OMAP_TYPE(3517, 0x3517) int omap_chip_is(struct omap_chip_id oci); -void omap2_check_revision(void); + +void omap_check_revision(void); /* * Runtime detection of OMAP3 features -- 1.6.3.3