From patchwork Thu Nov 19 15:57:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7658671 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 82061BF90C for ; Thu, 19 Nov 2015 15:57:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9A59720680 for ; Thu, 19 Nov 2015 15:57:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F8A820675 for ; Thu, 19 Nov 2015 15:57:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934262AbbKSP5i (ORCPT ); Thu, 19 Nov 2015 10:57:38 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:51886 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932944AbbKSP5h (ORCPT ); Thu, 19 Nov 2015 10:57:37 -0500 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue102) with ESMTPSA (Nemesis) id 0MhDFZ-1Zlslm0MrZ-00MMnb; Thu, 19 Nov 2015 16:57:07 +0100 From: Arnd Bergmann To: Felipe Balbi Cc: linux-omap@vger.kernel.org, Tony Lindgren , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH] ARM: OMAP2: use correct timer function for AM43XX and TI81XX Date: Thu, 19 Nov 2015 16:57:04 +0100 Message-ID: <6973517.kQfhdpsmVt@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <87egfplka4.fsf@saruman.tx.rr.com> References: <4016134.4bReocePei@wuerfel> <87egfplka4.fsf@saruman.tx.rr.com> MIME-Version: 1.0 X-Provags-ID: V03:K0:mn3B2Acn8GtrVVshhmRf65C5hPR2hNTghzEgHIL1UVOoW/auElW HyyJGVpnHdaHINumA1XY2TTfpMOxoe43VmYrTOL0sAA84qJ5sRJT8OnO10FvwL5801mN+cR Bu9JkxgHIi3kfMioDId53sZnHU9aKZR0/2/x/yvaHDoxEwTS3FJSkkToYGsdvjlVta46InQ bDZlOHzUnPRdtu+Nv/gKQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:UUEadg3AL50=:33VlpBlwd2Cu29ViZHUJrH IVrBjSrD1llkOHiUgZx0VMQWR91hh8btNXCyMvB9hE9bGU8G3SIWrygCnQSWWgZW0QdwBbTd8 OwPbsY11B3hGy6fK991z1tfI2Ad6on3FLQYxpyQiwXzRWPVqv6ABL3ddpM8Kntg5ZPlUDsWps eh/ygLF0NlkclaLdl29ldmz8JthKugoAjmd5hEBlnX6mh697MMxuLsrdDt24+QZL2kOmZiGbO iX/bsuK9wmUfJ3lZu4iZWc3c7ahJB0sqidXcyz229gw1Iy+HROzJzuQXERLWupNCy5tcx3xSW 7LrfIns+id/exmgfNCdnoi+BikNhlqMG8yVwpXmHOd3WxRzu+9UyLUvR/JdwT+0zMLt0thE1D N8Z8VgFhOxRx7A3SGQeVWitiemlORNijlUWt+WzApOPMz1Khu0NG8rM1T2k+koXwIu2XS/Xov scUbuqF/6Zp9XtOInhTa/FGHOyz8Axjk0on83XSZS6fiBzriNUXNpNpprConidsFk2Iwcf9Mp mjrGCf+4JsS5XWxXGp8HVAuXKAtOsQJqQmuLkQaztICd4+WuAzExQHcVGodGm4p+8ue8oUCOo j7L14o5gNgyOAAci/3B2yYosQKCkkXwx+vXViaLXXzJUkBJdDm57lxZIr5kzUBrIAORW6LVch n2eMMPak3k62AV+Q9SyU7ua/gxsF64HT8VLWtOPyNpZNE6CFe5kuNH9GNgVyJJtushv2HsmHS bSCT3n13U27foayG Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Monday 16 November 2015 15:13:55 Felipe Balbi wrote: > Arnd Bergmann writes: > > AM43XX and TI81XX use omap3_gptimer_timer_init(), but that is only > > built into the kernel for OMAP3 and AM33XX, otherwise we get: > > > > arch/arm/mach-omap2/built-in.o:(.arch.info.init+0x124): undefined reference to `omap3_gptimer_timer_init' > > > > This changes the Kconfig logic for building the function to > > match the callers. Consequently, we no longer need to build > > the omap3_secure_sync32k_timer_init and omap4_local_timer_init > > for the platforms that have been moved over to other functions. > > > > Signed-off-by: Arnd Bergmann > > no, AM43xx uses omap4_local_timer_init(), there's already a fix in > Tony's tree IIRC. ... > care to provide a defconfig which would cause a build error ? My mistake, the code has changed several times and I adapted it to the latest version each time, but the version I sent out is indeed useless. The only hunk that still makes sense is but that is harmless as it does not cause a build error, just a few extra bytes for an unused function in a AM43XX-only configuration. Arnd --- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index b18ebbefae09..b7ab09cc5ca2 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -494,7 +494,7 @@ void __init omap_init_time(void) clocksource_probe(); } -#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM43XX) +#if defined(CONFIG_ARCH_OMAP3) void __init omap3_secure_sync32k_timer_init(void) { __omap_sync32k_timer_init(12, "secure_32k_fck", "ti,timer-secure",