From patchwork Fri Oct 16 16:22:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 55128 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lf0-f69.google.com (mail-lf0-f69.google.com [209.85.215.69]) by patches.linaro.org (Postfix) with ESMTPS id AAA4122FFA for ; Fri, 16 Oct 2015 16:22:50 +0000 (UTC) Received: by lffv3 with SMTP id v3sf19961028lff.1 for ; Fri, 16 Oct 2015 09:22:49 -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 :in-reply-to:references: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=S7ujeMV3ZEsiiSTw3RgGU4IdwutE7QL7lDBQS9Y+w3Q=; b=DYL8JcCFXSY4Atuc63VDtsBBsgtW72seQW9Go1Qax4GuuKsXXDyCG558PlcRQowgvM MmOpyk2blVDgm800IIKyAHyxj4BwRGZVlv1k7frQkX6iydAbhUeJcRrlrsNzOy7wGhsx U8jUOkyE2SOQ3ce6TRYqVPAcRQMP4OF2qJXJXPmuIXiTkSlTjbHoIOAFLUaAMjZJ1Ty3 38aNEWVNxvjqIaNCpADuFAYd86lywn2HMDwIX1f4v5MSDBGF8g+0SjuYnce0x9qtXTnB 0gXrt+66/i40dWlMfOTLW0cIZJjgFi2HdM7nK3DlCMhipmL5HHkPUtK1ehf5cei+CSiw JvgA== X-Gm-Message-State: ALoCoQlrc1Q0VipcuvvAAZaoimE4j4qVAPqQbHpIGAfSEMp7CYJk5a4YsOsrRdVcasdjhhI/haM8 X-Received: by 10.112.202.165 with SMTP id kj5mr3766769lbc.5.1445012569448; Fri, 16 Oct 2015 09:22:49 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.78.81 with SMTP id c78ls309183lfb.45.gmail; Fri, 16 Oct 2015 09:22:49 -0700 (PDT) X-Received: by 10.25.15.83 with SMTP id e80mr3349404lfi.34.1445012569316; Fri, 16 Oct 2015 09:22:49 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id g128si13367635lfb.137.2015.10.16.09.22.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Oct 2015 09:22:49 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by lbbes7 with SMTP id es7so14443187lbb.2 for ; Fri, 16 Oct 2015 09:22:49 -0700 (PDT) X-Received: by 10.112.180.230 with SMTP id dr6mr8730682lbc.72.1445012569182; Fri, 16 Oct 2015 09:22:49 -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 w3csp17192lbq; Fri, 16 Oct 2015 09:22:48 -0700 (PDT) X-Received: by 10.50.41.74 with SMTP id d10mr6817184igl.94.1445012561780; Fri, 16 Oct 2015 09:22:41 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e193si17094897ioe.131.2015.10.16.09.22.41; Fri, 16 Oct 2015 09:22:41 -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 S932366AbbJPQWk (ORCPT + 5 others); Fri, 16 Oct 2015 12:22:40 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:48711 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754342AbbJPQWj (ORCPT ); Fri, 16 Oct 2015 12:22:39 -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 t9GGMDVA032263; Fri, 16 Oct 2015 11:22:13 -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 t9GGMDJ3028269; Fri, 16 Oct 2015 11:22:13 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.224.2; Fri, 16 Oct 2015 11:22:14 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id t9GGMCcg002061; Fri, 16 Oct 2015 11:22:13 -0500 From: Felipe Balbi To: Tony Lindgren CC: Linux OMAP Mailing List , Linux ARM Kernel Mailing List , Felipe Balbi Subject: [PATCH 01/11] arm: omap2: timer: always define omap4_local_timer_init Date: Fri, 16 Oct 2015 11:22:00 -0500 Message-ID: <1445012530-14126-2-git-send-email-balbi@ti.com> X-Mailer: git-send-email 2.5.3 In-Reply-To: <1445012530-14126-1-git-send-email-balbi@ti.com> References: <1445012530-14126-1-git-send-email-balbi@ti.com> 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.217.172 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 --- 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 a55655127ef2..548d922cb107 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -630,32 +630,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)