From patchwork Fri Dec 7 09:51:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Grinberg X-Patchwork-Id: 1849361 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id CEEA73FCD5 for ; Fri, 7 Dec 2012 09:55:24 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tguaq-00004w-5s; Fri, 07 Dec 2012 09:51:40 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Tguam-0008WV-I8 for linux-arm-kernel@merlin.infradead.org; Fri, 07 Dec 2012 09:51:37 +0000 Received: from softlayer.compulab.co.il ([50.23.254.55] helo=compulab.co.il) by casper.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Tguai-0001KM-Pk for linux-arm-kernel@lists.infradead.org; Fri, 07 Dec 2012 09:51:35 +0000 Received: from [62.90.235.247] (port=41363 helo=zimbra-mta.compulab.co.il) by softlayer.compulab.co.il with esmtp (Exim 4.80) (envelope-from ) id 1TguaT-0003OZ-81; Fri, 07 Dec 2012 11:51:18 +0200 Received: from localhost (localhost.localdomain [127.0.0.1]) by zimbra-mta.compulab.co.il (Postfix) with ESMTP id 6734E644195; Fri, 7 Dec 2012 11:51:16 +0200 (IST) X-Virus-Scanned: amavisd-new at compulab.co.il Received: from zimbra-mta.compulab.co.il ([127.0.0.1]) by localhost (zimbra-mta.compulab.co.il [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id geB3icyrxx7S; Fri, 7 Dec 2012 11:51:15 +0200 (IST) Received: from [10.1.1.13] (grinberg-pc.compulab.local [10.1.1.13]) by zimbra-mta.compulab.co.il (Postfix) with ESMTP id F24CB644194; Fri, 7 Dec 2012 11:51:14 +0200 (IST) Message-ID: <50C1BC10.8000506@compulab.co.il> Date: Fri, 07 Dec 2012 11:51:12 +0200 From: Igor Grinberg Organization: CompuLab Ltd. User-Agent: Mozilla/5.0 (X11; Linux i686; rv:10.0.7) Gecko/20121022 Thunderbird/10.0.7 MIME-Version: 1.0 To: Stephen Warren Subject: Re: [PATCH V3 11/11] ARM: delete struct sys_timer References: <1353349867-28494-1-git-send-email-swarren@wwwdotorg.org> <1353349867-28494-12-git-send-email-swarren@wwwdotorg.org> In-Reply-To: <1353349867-28494-12-git-send-email-swarren@wwwdotorg.org> X-Enigmail-Version: 1.3.5 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - softlayer.compulab.co.il X-AntiAbuse: Original Domain - lists.infradead.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - compulab.co.il X-Get-Message-Sender-Via: softlayer.compulab.co.il: acl_c_relayhosts_text_entry: grinberg@compulab.co.il|compulab.co.il X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121207_095133_140325_A2E44D6D X-CRM114-Status: GOOD ( 25.03 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on casper.infradead.org summary: Content analysis details: (-1.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-arch@vger.kernel.org, Russell King , Arnd Bergmann , Tony Lindgren , John Stultz , linux-kernel@vger.kernel.org, Santosh Shilimkar , "Hunter, Jon" , Olof Johansson , Stephen Warren , Thomas Gleixner , "linux-omap@vger.kernel.org" , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Hi Stephen, I've only now bumped into the patchset (working the back log on linux-arm). Sorry for late reply, but I guess you should have Cc'd the relevant mailing lists with such changes. Cc'd now. On 11/19/12 20:31, Stephen Warren wrote: > From: Stephen Warren > > Now that the only field in struct sys_timer is .init, delete the struct, > and replace the machine descriptor .timer field with the initialization > function itself. > > This will enable moving timer drivers into drivers/clocksource without > having to place a public prototype of each struct sys_timer object into > include/linux; the intent is to create a single of_clocksource_init() > function that determines which timer driver to initialize by scanning > the device dtree, much like the proposed irqchip_init() at: > http://www.spinics.net/lists/arm-kernel/msg203686.html > > Signed-off-by: Stephen Warren > Tested-by: Robert Jarzmik > --- > v3: Minor merge conflicts due to rebasing onto next-20121115. > v2: Converted all platforms, not just Tegra. > > The patch is very large, so I've trimmed it for the mailing list, leaving > only the core ARM changes, changes outside arch/arm, and a single machine > example. The full series can be found at: > > git://nv-tegra.nvidia.com/user/swarren/linux-2.6 arm_timer_rework > --- [...] > arch/arm/mach-omap1/board-ams-delta.c | 2 +- > arch/arm/mach-omap1/board-fsample.c | 2 +- > arch/arm/mach-omap1/board-generic.c | 2 +- > arch/arm/mach-omap1/board-h2.c | 2 +- > arch/arm/mach-omap1/board-h3.c | 2 +- > arch/arm/mach-omap1/board-htcherald.c | 2 +- > arch/arm/mach-omap1/board-innovator.c | 2 +- > arch/arm/mach-omap1/board-nokia770.c | 2 +- > arch/arm/mach-omap1/board-osk.c | 2 +- > arch/arm/mach-omap1/board-palmte.c | 2 +- > arch/arm/mach-omap1/board-palmtt.c | 2 +- > arch/arm/mach-omap1/board-palmz71.c | 2 +- > arch/arm/mach-omap1/board-perseus2.c | 2 +- > arch/arm/mach-omap1/board-sx1.c | 2 +- > arch/arm/mach-omap1/board-voiceblue.c | 2 +- > arch/arm/mach-omap1/common.h | 2 +- > arch/arm/mach-omap1/time.c | 6 +----- > arch/arm/mach-omap2/board-2430sdp.c | 2 +- > arch/arm/mach-omap2/board-3430sdp.c | 2 +- > arch/arm/mach-omap2/board-3630sdp.c | 2 +- > arch/arm/mach-omap2/board-4430sdp.c | 2 +- > arch/arm/mach-omap2/board-am3517crane.c | 2 +- > arch/arm/mach-omap2/board-am3517evm.c | 2 +- > arch/arm/mach-omap2/board-apollon.c | 2 +- > arch/arm/mach-omap2/board-cm-t35.c | 4 ++-- > arch/arm/mach-omap2/board-cm-t3517.c | 2 +- > arch/arm/mach-omap2/board-devkit8000.c | 2 +- > arch/arm/mach-omap2/board-generic.c | 12 ++++++------ > arch/arm/mach-omap2/board-h4.c | 2 +- > arch/arm/mach-omap2/board-igep0020.c | 4 ++-- > arch/arm/mach-omap2/board-ldp.c | 2 +- > arch/arm/mach-omap2/board-n8x0.c | 6 +++--- > arch/arm/mach-omap2/board-omap3beagle.c | 2 +- > arch/arm/mach-omap2/board-omap3evm.c | 2 +- > arch/arm/mach-omap2/board-omap3logic.c | 4 ++-- > arch/arm/mach-omap2/board-omap3pandora.c | 2 +- > arch/arm/mach-omap2/board-omap3stalker.c | 2 +- > arch/arm/mach-omap2/board-omap3touchbook.c | 2 +- > arch/arm/mach-omap2/board-omap4panda.c | 2 +- > arch/arm/mach-omap2/board-overo.c | 2 +- > arch/arm/mach-omap2/board-rm680.c | 4 ++-- > arch/arm/mach-omap2/board-rx51.c | 2 +- > arch/arm/mach-omap2/board-ti8168evm.c | 4 ++-- > arch/arm/mach-omap2/board-zoom.c | 4 ++-- > arch/arm/mach-omap2/common.h | 12 ++++++------ > arch/arm/mach-omap2/timer.c | 17 +++-------------- [...] > 492 files changed, 622 insertions(+), 1199 deletions(-) I've looked at the omap2+ changes and I think OMAP4 and 5 got messed up a bit... the below (compile tested on omap2plus only) should be applied: diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 2e0c446..f5d5f59 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -725,6 +725,6 @@ MACHINE_START(OMAP_4430SDP, "OMAP4430 4430SDP board") .handle_irq = gic_handle_irq, .init_machine = omap_4430sdp_init, .init_late = omap4430_init_late, - .init_time = omap4_sync32k_timer_init, + .init_time = omap4_local_timer_init, .restart = omap44xx_restart, MACHINE_END diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 5da84a9..8a5f814 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -159,7 +159,7 @@ DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)") .handle_irq = gic_handle_irq, .init_machine = omap_generic_init, .init_late = omap4430_init_late, - .init_time = omap4_sync32k_timer_init, + .init_time = omap4_local_timer_init, .dt_compat = omap4_boards_compat, .restart = omap44xx_restart, MACHINE_END @@ -179,7 +179,7 @@ DT_MACHINE_START(OMAP5_DT, "Generic OMAP5 (Flattened Device Tree)") .init_irq = omap_gic_of_init, .handle_irq = gic_handle_irq, .init_machine = omap_generic_init, - .init_time = omap5_sync32k_timer_init, + .init_time = omap5_realtime_timer_init, .dt_compat = omap5_boards_compat, .restart = omap44xx_restart, MACHINE_END diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index fcae01e..ed8240c 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -456,6 +456,6 @@ MACHINE_START(OMAP4_PANDA, "OMAP4 Panda board") .handle_irq = gic_handle_irq, .init_machine = omap4_panda_init, .init_late = omap4430_init_late, - .init_time = omap4_sync32k_timer_init, + .init_time = omap4_local_timer_init, .restart = omap44xx_restart, MACHINE_END diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index 56a3281..b435027 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -84,8 +84,8 @@ extern void omap3_sync32k_timer_init(void); extern void omap3_secure_sync32k_timer_init(void); extern void omap3_gp_gptimer_timer_init(void); extern void omap3_am33xx_gptimer_timer_init(void); -extern void omap4_sync32k_timer_init(void); -extern void omap5_sync32k_timer_init(void); +extern void omap4_local_timer_init(void); +extern void omap5_realtime_timer_init(void); void omap2420_init_early(void); void omap2430_init_early(void);