From patchwork Mon Nov 16 21:10:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7630771 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3FB5C9F1C2 for ; Mon, 16 Nov 2015 21:10:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 567E320562 for ; Mon, 16 Nov 2015 21:10:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 67E002054C for ; Mon, 16 Nov 2015 21:10:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752678AbbKPVKd (ORCPT ); Mon, 16 Nov 2015 16:10:33 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:65082 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752306AbbKPVKb (ORCPT ); Mon, 16 Nov 2015 16:10:31 -0500 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue002) with ESMTPSA (Nemesis) id 0LlMaV-1aYafV3we7-00bH3z; Mon, 16 Nov 2015 22:10:03 +0100 From: Arnd Bergmann To: linux-omap@vger.kernel.org, Tony Lindgren Cc: linux-arm-kernel@lists.infradead.org, Felipe Balbi Subject: [PATCH] ARM: OMAP2: use correct timer function for AM43XX and TI81XX Date: Mon, 16 Nov 2015 22:10:01 +0100 Message-ID: <4016134.4bReocePei@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:1GH/VSRd7PLVe1SDCTEUM/+B0vhphvOgTEaWA2fXnqyYyIr9JQ9 vbTUjEuqhSCaWrM+coiZ0ypjt5KcnwqUks64JBlXOdBbfpM86EMXSQ08Hm7vLZhykOD7EQz XrdCkuoyzLO9i1sAGS/nmaX13UOWS3uh3OETrBGrr9DYpXTRGcfBev5Dpc1l6bSSkzcn69D y72slKuYV57SeQLDnZwyQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:nwAt6pRq7Q8=:JlFsge/0BEovlkK4SziZeT 3OzjFJMT5gxWdwyW0GXbT92N+qa7V22py4Q774uTxlsTa2ffMrQtry30C3fUkjyQW3OvZd/Aj 7vPaOmFjXPiQ3Y7VsELu6sw1dL5GrYUbvWNznud4uj5dg5+ZVPz9O+RvXm7rlMX0uMTlPXczy fXdSu3PDS3ktXCjpO86RBsuqkVrWv7q3bWwiH7ZYRZZF+CR7TsH+ytBNfcMK1GBzQRy++pH1N hyX3QTDpA0xsclihg+Jpnkb3f0u6clc0KkkiS4WwNrrvrOqLlKgPrpL5DfdIrdewx56KS3bJ7 lPKOGB4WVHLyLtVO0BdVMZ73XaEGGRYyuVSg+M29+thrUlEiOPqxxlUUXGKqcOlWRWYuKsyGY jiOpUfS8UdyTKYyZ987a18yzn9mS1XT816/z3LnzpTXcOR/vODpAZQ5zKMGwUo25prteGqtS8 dKICujSlgQPq6rbarKSlnnM1tksX2gQIHDbAE9s9cgVfvi9Rh7C1yfoxI0nm2OjGqXasBh8vU EyVxbNW4xMHzkaEURnMKhooZa2mIHhQk4pzAdxPdIhjfndD9X3ie1kN/Juh11MtCMqMtSoIdR qOA8XHvWiPI4SOiYgg1eqcyMD5/y61D96nK744fZX2gCS6OGJoKRgM3d4SEoocseiWplXvxUR zpD31igA8SgrAHzDWeJyI807nMRSFyRFRLdLYfAabppTCAzIWVkk7R78QiR2McroEXOmDExX8 czzEEFmvEmsQWMuV 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.7 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 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 --- The code has changed a couple of times, but this version no longer produces build errors for me. -- 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..b07dd70b2de1 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", @@ -502,7 +502,7 @@ void __init omap3_secure_sync32k_timer_init(void) } #endif /* CONFIG_ARCH_OMAP3 */ -#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) +#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) || defined(CONFIG_SOC_TI81XX) void __init omap3_gptimer_timer_init(void) { __omap_sync32k_timer_init(2, "timer_sys_ck", NULL, @@ -510,8 +510,7 @@ void __init omap3_gptimer_timer_init(void) } #endif -#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \ - defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX) +#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX) static void __init omap4_sync32k_timer_init(void) { __omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",