From patchwork Fri Oct 16 16:22:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 55129 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lf0-f70.google.com (mail-lf0-f70.google.com [209.85.215.70]) by patches.linaro.org (Postfix) with ESMTPS id 82ADA22FFA for ; Fri, 16 Oct 2015 16:22:53 +0000 (UTC) Received: by lffv3 with SMTP id v3sf19961402lff.1 for ; Fri, 16 Oct 2015 09:22:52 -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=k3rBMdSjRcylhSbNaoxOxLvstIESwy3FbaqtNSbSmOs=; b=Jb/MiZuuryG8algACMjHUZ5m10g8hms1Wj4cjqih4/o6dif/YuKCG7CqESZvES/vem vStrVuSrqcXIPTlH+k7SUd2AVYULy9t8EtWDMbpl4t7ivP2kr8PrbbN8kVUWHHS7D8/R 2fABQiMcpUqv9Oo7VwmpLBj63frXY8Dwsd/rvgiyeoSiF4eTTo/outKQtr7zSeuJl6fj bjU2c7lfRwUFss7l4Ujfh/Y83/FlrytofS5bKsuH6Ok7Ay5iFuh8dQQ5EAWG/1Wk8fy1 pPLM+kTLY9lNI07+15lP53RXcQlixEH6WnKTl5735hPHboUNc0DhvWgoiZrtzzw8MXDz UnGg== X-Gm-Message-State: ALoCoQnVBFijplLdmshiou5kCEIdmVUKmadEgKcStx4r0ChDU+ZWoUOQhB6C3n6F0/wSvPEAvnDh X-Received: by 10.112.202.165 with SMTP id kj5mr3766829lbc.5.1445012572477; Fri, 16 Oct 2015 09:22:52 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.17.203 with SMTP id 72ls314043lfr.24.gmail; Fri, 16 Oct 2015 09:22:52 -0700 (PDT) X-Received: by 10.25.160.133 with SMTP id j127mr5635672lfe.85.1445012572202; Fri, 16 Oct 2015 09:22:52 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id ad7si13362343lbc.116.2015.10.16.09.22.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Oct 2015 09:22:52 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by lbbpp2 with SMTP id pp2so75776011lbb.0 for ; Fri, 16 Oct 2015 09:22:52 -0700 (PDT) X-Received: by 10.112.64.72 with SMTP id m8mr8528433lbs.41.1445012572089; Fri, 16 Oct 2015 09:22:52 -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 w3csp17216lbq; Fri, 16 Oct 2015 09:22:50 -0700 (PDT) X-Received: by 10.107.163.129 with SMTP id m123mr17732427ioe.166.1445012563307; Fri, 16 Oct 2015 09:22:43 -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.43; Fri, 16 Oct 2015 09:22:43 -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 S1754339AbbJPQWl (ORCPT + 5 others); Fri, 16 Oct 2015 12:22:41 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:53755 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932255AbbJPQWk (ORCPT ); Fri, 16 Oct 2015 12:22:40 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id t9GGMGnd020338; Fri, 16 Oct 2015 11:22:16 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id t9GGMGmC028447; Fri, 16 Oct 2015 11:22:16 -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; Fri, 16 Oct 2015 11:22:16 -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 t9GGMFh6006218; Fri, 16 Oct 2015 11:22:16 -0500 From: Felipe Balbi To: Tony Lindgren CC: Linux OMAP Mailing List , Linux ARM Kernel Mailing List , Felipe Balbi Subject: [PATCH 04/11] arm: omap2: timer: remove __omap_gptimer_init() Date: Fri, 16 Oct 2015 11:22:03 -0500 Message-ID: <1445012530-14126-5-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.179 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: , __omap_sync32k_timer_init(), now takes the clock source as a parameter. This means we no longer need __omap_gptimer_init(). Note that __omap_sync32k_timer_init() will be renamed in a follow-up patch as it's not longer 32k source specific. Signed-off-by: Felipe Balbi --- 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 f53ed049d710..976ff9fa3594 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -592,16 +592,6 @@ static inline void __init realtime_counter_init(void) {} #endif -static void __init __omap_gptimer_init(int clkev_nr, const char *clkev_src, - const char *clkev_prop, int clksrc_nr, const char *clksrc_src, - const char *clksrc_prop) -{ - omap_clk_init(); - omap_dmtimer_init(); - omap2_gp_clockevent_init(clkev_nr, clkev_src, clkev_prop); - omap2_gptimer_clocksource_init(clksrc_nr, clksrc_src, clksrc_prop); -} - static void __init __omap_sync32k_timer_init(int clkev_nr, const char *clkev_src, const char *clkev_prop, int clksrc_nr, const char *clksrc_src, const char *clksrc_prop, bool gptimer) @@ -643,8 +633,8 @@ void __init omap3_secure_sync32k_timer_init(void) #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) void __init omap3_gptimer_timer_init(void) { - __omap_gptimer_init(2, "timer_sys_ck", NULL, - 1, "timer_sys_ck", "ti,timer-alwon"); + __omap_sync32k_timer_init(2, "timer_sys_ck", NULL, + 1, "timer_sys_ck", "ti,timer-alwon", true); } #endif