From patchwork Tue Sep 29 16:15:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 54245 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id C432322EAF for ; Tue, 29 Sep 2015 16:16:11 +0000 (UTC) Received: by wicgb1 with SMTP id gb1sf8404150wic.3 for ; Tue, 29 Sep 2015 09:16:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :mime-version:content-type:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=Xu/RH3O1KOe0fOqdYe6a7cIrg8rxb0AH13XoSykzSIk=; b=LnsC9O9t/LKWVVIHXOJd0gLjKDrCvsVlEwMdkPrrPyBSXaGMpN+OM1ozuhbJ9zPkpN zfhBCQL3g/KC+1+ehGYlF1qYNh0KM/6JXYKlAxjnyBgCXado0/jvACzKGYdDBRdInSNE lFMr6RxBPh/Ur4UmuxSDltPExfy0s+lr5U58Nnn3OA/s59jnjucf1ZcDq4iheD6CF09m X/MxQM41eMGHx0hBvqyXw0g+PtbYk6jP+GfQaj0X9W1LCTu5Kw8s7Tdi8O0e9I9iRvvO lBop8AkPqFxhlEEiCQOEYbaChU1GNCYAAspwpC8YgTWlDf5/9ROFHpRc2sPTDPM2C2z+ EsNw== X-Gm-Message-State: ALoCoQlA4xzqa+7pFg7Jl5MDeidOY9vh3rbBvijI3UqK8YiNKtaZUF37mefCKbCx67fpmnh4/O5H X-Received: by 10.112.202.165 with SMTP id kj5mr4456049lbc.5.1443543371099; Tue, 29 Sep 2015 09:16:11 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.169.198 with SMTP id s189ls336121lfe.87.gmail; Tue, 29 Sep 2015 09:16:10 -0700 (PDT) X-Received: by 10.112.164.35 with SMTP id yn3mr7512128lbb.18.1443543370958; Tue, 29 Sep 2015 09:16:10 -0700 (PDT) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id w9si11292451lad.28.2015.09.29.09.16.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2015 09:16:10 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by laclj5 with SMTP id lj5so14914995lac.3 for ; Tue, 29 Sep 2015 09:16:10 -0700 (PDT) X-Received: by 10.152.5.133 with SMTP id s5mr7640081las.19.1443543370656; Tue, 29 Sep 2015 09:16:10 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp2238584lbq; Tue, 29 Sep 2015 09:16:09 -0700 (PDT) X-Received: by 10.68.218.104 with SMTP id pf8mr33929649pbc.31.1443543369515; Tue, 29 Sep 2015 09:16:09 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ys4si38488615pac.68.2015.09.29.09.16.09; Tue, 29 Sep 2015 09:16:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933477AbbI2QQI (ORCPT + 5 others); Tue, 29 Sep 2015 12:16:08 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:57525 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932887AbbI2QQG (ORCPT ); Tue, 29 Sep 2015 12:16:06 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id t8TGFdxW011766; Tue, 29 Sep 2015 11:15:39 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8TGFdtn028467; Tue, 29 Sep 2015 11:15:39 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.224.2; Tue, 29 Sep 2015 11:15:39 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8TGFcMd031426; Tue, 29 Sep 2015 11:15:38 -0500 From: Felipe Balbi To: Tony Lindgren CC: Nishanth Menon , Linux OMAP Mailing List , Linux ARM Kernel Mailing List , Felipe Balbi Subject: [PATCHv4] arm: omap2: timer: always define omap4_local_timer_init Date: Tue, 29 Sep 2015 11:15:37 -0500 Message-ID: <1443543337-2904-1-git-send-email-balbi@ti.com> X-Mailer: git-send-email 2.5.3 MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: balbi@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , omap4_local_timer_init() can be used by other platforms as is. At least AM437x wants to use it. Instead of making omap4-only and providing a stub for builds without OMAP4, we can just make sure that function is always available for all SoCs that need it. Reported-by: Nishanth Menon Signed-off-by: Felipe Balbi Reviewed-by: Nishanth Menon --- changes since v3: - modify commit log slightly changes since v2: - move ifdefs around changes since v1: - make sure result builds on AM43xx-only builds arch/arm/mach-omap2/timer.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index e4d8701f99f9..3ebe16cd645e 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -634,32 +634,22 @@ OMAP_SYS_32K_TIMER_INIT(3_secure, 12, "secure_32k_fck", "ti,timer-secure", 2, "timer_sys_ck", NULL); #endif /* CONFIG_ARCH_OMAP3 */ -#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) || \ - defined(CONFIG_SOC_AM43XX) +#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) OMAP_SYS_GP_TIMER_INIT(3, 2, "timer_sys_ck", NULL, 1, "timer_sys_ck", "ti,timer-alwon"); #endif #if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \ - defined(CONFIG_SOC_DRA7XX) + defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX) static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon", 2, "sys_clkin_ck", NULL); -#endif -#ifdef CONFIG_ARCH_OMAP4 -#ifdef CONFIG_HAVE_ARM_TWD void __init omap4_local_timer_init(void) { omap4_sync32k_timer_init(); clocksource_of_init(); } -#else -void __init omap4_local_timer_init(void) -{ - omap4_sync32k_timer_init(); -} -#endif /* CONFIG_HAVE_ARM_TWD */ -#endif /* CONFIG_ARCH_OMAP4 */ +#endif #if defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX) void __init omap5_realtime_timer_init(void)