From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nishanth Menon Subject: Re: [PATCH 3/9 v3] omap: generic: introduce a single check_revision Date: Fri, 25 Jun 2010 12:31:36 -0500 Message-ID: <4C24E7F8.90007@ti.com> References: <1277483122-3616-1-git-send-email-nm@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from bear.ext.ti.com ([192.94.94.41]:41642 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752488Ab0FYRbs (ORCPT ); Fri, 25 Jun 2010 13:31:48 -0400 In-Reply-To: Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: "Shilimkar, Santosh" Cc: linux-omap , Tony Lindgren , Angelo Arrifano , "Zebediah C. McClure" , Alistair Buxton , Grazvydas Ignotas , Paul Walmsley , "Premi, Sanjeev" , "Guruswamy, Senthilvadivu" , Kevin Hilman , "DebBarma, Tarun Kanti" , Tomi Valkeinen , Aaro Koskinen , "Pandita, Vikram" , "S, Vishwanath" Shilimkar, Santosh had written, on 06/25/2010 11:41 AM, the following: >> -----Original Message----- >> From: Menon, Nishanth >> Sent: Friday, June 25, 2010 9:55 PM >> To: linux-omap >> Cc: Tony Lindgren; Menon, Nishanth; 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; linux- >> omap@vger.kernel.org >> Subject: [PATCH 3/9 v3] 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. This >> allows for the headers definitions of omap1_check_revision() and >> omap2_check_revision() to be used without #ifdefs and additional cpu >> checks in our single check_revision. >> >> 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 >> --- >> V3: comments from http://marc.info/?t=127747252000003&r=1&w=2 >> fixed >> V2: comments from http://marc.info/?t=127725956100006&r=1&w=2 >> fixed >> V1: original >> arch/arm/mach-omap1/io.c | 3 +-- >> arch/arm/mach-omap2/io.c | 2 +- >> arch/arm/plat-omap/common.c | 6 ++++++ >> arch/arm/plat-omap/include/plat/cpu.h | 13 ++++++++++++- >> 4 files changed, 20 insertions(+), 4 deletions(-) >> >> 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..4a0e333 100644 >> --- a/arch/arm/plat-omap/common.c >> +++ b/arch/arm/plat-omap/common.c >> @@ -89,6 +89,12 @@ void __init omap_reserve(void) >> omap_vram_reserve_sdram_lmb(); >> } >> >> +void __init omap_check_revision(void) >> +{ >> + omap1_check_revision(); >> + omap2_check_revision(); >> +} >> + >> /* >> * 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) {} > I think codingstyle suggest empty function braces to be on next line > like > static inline void omap2_check_revision(void) > {} are you sure about that? can you point me to the documentation for that? Style I followed is off: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=Documentation/SubmittingPatches;h=72651f788f4e3536149ef5e7ddfbed96a8f14d2f;hb=HEAD#l661 >> +#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 > > Otherwise patch looks good to me. thanks for the ack. >> -- >> 1.6.3.3 > -- Regards, Nishanth Menon