From patchwork Mon Sep 28 18:25:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 54208 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by patches.linaro.org (Postfix) with ESMTPS id 6E6EE22DEE for ; Mon, 28 Sep 2015 18:26:16 +0000 (UTC) Received: by wicmn1 with SMTP id mn1sf43466753wic.1 for ; Mon, 28 Sep 2015 11:26:15 -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=h2HPgksbI0M29h/DtFe5SblSrhdAfI+aw/ILMZ71XHE=; b=nNcyI/rbG1vAbr9830hDGiQBjvJoc+P1ycQopiSmvOHIrN80dYd570eHKy6gSW/HG2 hsJuLeF/YfWJqZSLZEIPqSzSKN0cJsV50+SDzXDFUvcWnIiuSZEST/C08BNnilhadZYa Zr+KGj2AzH11eFws2aYGlKh9S76nZfUb6JDwt90OcDLN2K+ZiZ2t7zs/PuEtEpo0mXAz SWRNKJxwYRV4xjaDYeDmOU6sRC0FncelQYiE/Qy/ZGGm664TDE1Fl2FCqqRx/RE6j7Qr azTeK1PMqazsMdmnp2ueWqMbJ3qBf2NiopqR2HohJt1V0VEyy7b5EZqTuo+fUvbwAPlr RpIw== X-Gm-Message-State: ALoCoQn9vaVzGB/Kpj7mO/vl8C+Uo/7UOx73ddTEsn9gAwDPPERNCKCyT7gFcE5ZHZb86ueD33+i X-Received: by 10.180.160.146 with SMTP id xk18mr3104038wib.3.1443464775764; Mon, 28 Sep 2015 11:26:15 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.154.131 with SMTP id c125ls353029lfe.52.gmail; Mon, 28 Sep 2015 11:26:15 -0700 (PDT) X-Received: by 10.25.141.198 with SMTP id p189mr4003638lfd.9.1443464775614; Mon, 28 Sep 2015 11:26:15 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id al9si8870687lbc.51.2015.09.28.11.26.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Sep 2015 11:26:15 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by laer8 with SMTP id r8so41192171lae.2 for ; Mon, 28 Sep 2015 11:26:15 -0700 (PDT) X-Received: by 10.152.37.162 with SMTP id z2mr5901356laj.117.1443464775449; Mon, 28 Sep 2015 11:26:15 -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 w3csp1702537lbq; Mon, 28 Sep 2015 11:26:14 -0700 (PDT) X-Received: by 10.107.40.12 with SMTP id o12mr20990532ioo.84.1443464774339; Mon, 28 Sep 2015 11:26:14 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n35si13495449ioi.80.2015.09.28.11.26.14; Mon, 28 Sep 2015 11:26:14 -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 S1754912AbbI1S0N (ORCPT + 5 others); Mon, 28 Sep 2015 14:26:13 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:35934 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752247AbbI1S0M (ORCPT ); Mon, 28 Sep 2015 14:26:12 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id t8SIPkee005933; Mon, 28 Sep 2015 13:25:46 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8SIPkLE000744; Mon, 28 Sep 2015 13:25:46 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.224.2; Mon, 28 Sep 2015 13:25:46 -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 t8SIPjS1009314; Mon, 28 Sep 2015 13:25:46 -0500 From: Felipe Balbi To: Tony Lindgren CC: Linux OMAP Mailing List , Linux ARM Kernel Mailing List , Felipe Balbi Subject: [PATCH] arm: omap2: timer: always define omap4_local_timer_init Date: Mon, 28 Sep 2015 13:25:44 -0500 Message-ID: <1443464744-16561-1-git-send-email-balbi@ti.com> X-Mailer: git-send-email 2.5.0.GIT 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.54 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 --- arch/arm/mach-omap2/timer.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index a55655127ef2..f9028582e962 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -642,20 +642,11 @@ 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)