From patchwork Mon Sep 28 21:23:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 54212 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by patches.linaro.org (Postfix) with ESMTPS id B62EC22B1E for ; Mon, 28 Sep 2015 21:24:02 +0000 (UTC) Received: by wicmn1 with SMTP id mn1sf45461101wic.1 for ; Mon, 28 Sep 2015 14:24:02 -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=9KpogUHBB+1uxFsQ61hly5wXZO2Hb/mFFIvThLp9P0s=; b=J1IkaVWrObXv2npWBYc5aoaylIzTNhA1MWvwu40e9kh4DK5uE+jo5vQZ+Pfn7Uk6i7 n28Ymxzfk+ZFJIostVJM2imDrQgCjzafk+RtUDRH7Y6Le6h3a3qCd5E40jxKM5dp2dMy ltGSULTJmcXnbKGzHLOoynsAWz6+kxzoFpvsSHjhha5DKZkkM+6E6Z920nYhJmBenZ2T 25sn46sZcm1dnzQ7/dsKEeFJuagmxCSuOuvNC5KqQENmgEzuNCPqpom+aw5lzCQNKsp+ MZYXrysP1vZsLdvi/6a8RVfRs2WJ+IVSFir7swCgYEeL02w2fifehQijxkzatovFMUhx rwxg== X-Gm-Message-State: ALoCoQm6xZaZcZztYD97eaSzhdAcNEGEKKanEw0nf7+98s5yAkBYGN+jO24k7MNki1HFzaBQsdc5 X-Received: by 10.112.55.69 with SMTP id q5mr3522362lbp.24.1443475442010; Mon, 28 Sep 2015 14:24:02 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.90.76 with SMTP id o73ls349780lfb.93.gmail; Mon, 28 Sep 2015 14:24:01 -0700 (PDT) X-Received: by 10.112.136.201 with SMTP id qc9mr6317682lbb.94.1443475441614; Mon, 28 Sep 2015 14:24:01 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id ry9si9230460lbb.99.2015.09.28.14.24.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Sep 2015 14:24:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by laer8 with SMTP id r8so46266092lae.2 for ; Mon, 28 Sep 2015 14:24:01 -0700 (PDT) X-Received: by 10.112.129.202 with SMTP id ny10mr5917500lbb.112.1443475441323; Mon, 28 Sep 2015 14:24:01 -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 w3csp1776035lbq; Mon, 28 Sep 2015 14:24:00 -0700 (PDT) X-Received: by 10.68.201.232 with SMTP id kd8mr28591966pbc.102.1443475439566; Mon, 28 Sep 2015 14:23:59 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ya7si31515647pbc.121.2015.09.28.14.23.59; Mon, 28 Sep 2015 14:23:59 -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 S1753575AbbI1VX5 (ORCPT + 5 others); Mon, 28 Sep 2015 17:23:57 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:41230 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753276AbbI1VXz (ORCPT ); Mon, 28 Sep 2015 17:23:55 -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 t8SLNUaj004293; Mon, 28 Sep 2015 16:23:30 -0500 Received: from DLEE70.ent.ti.com (dlemailx.itg.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8SLNUOS005040; Mon, 28 Sep 2015 16:23:30 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.224.2; Mon, 28 Sep 2015 16:23:30 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8SLNTHG013143; Mon, 28 Sep 2015 16:23:30 -0500 From: Felipe Balbi To: Tony Lindgren CC: Nishanth Menon , Linux OMAP Mailing List , Linux ARM Kernel Mailing List , Felipe Balbi Subject: [PATCHv2] arm: omap2: timer: always define omap4_local_timer_init Date: Mon, 28 Sep 2015 16:23:25 -0500 Message-ID: <1443475405-15977-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.50 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 always define that function. Reported-by: Nishanth Menon Signed-off-by: Felipe Balbi --- changes since v1: - make sure result builds on AM43xx-only builds arch/arm/mach-omap2/timer.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index e4d8701f99f9..3cdd22251a0d 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 */ #if defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX) void __init omap5_realtime_timer_init(void)