From patchwork Tue Oct 6 17:01:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 54543 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by patches.linaro.org (Postfix) with ESMTPS id 41EA822FC5 for ; Tue, 6 Oct 2015 17:02:53 +0000 (UTC) Received: by lbos8 with SMTP id s8sf26896708lbo.2 for ; Tue, 06 Oct 2015 10:02: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=oyDwLNmTPpJSX4Xmz3Nna5R5T312lXXjDlNn6SAoMws=; b=atEYbFPIvMEywEV7EHPrkULPWcP75Ep6QheC3XrHqpiSwBlbiFJtFlI/P27LvibsvS HUDOgqQosA65hXoPUyP2FRmMYQt08fKHhDXHzGw5W3MnAwaoNiMZXUPREGw7bgl0Ho/M mYMv46cLrgSbvYmTJh4tsFYy+E42xeDd4+mBGG9KNPfjnBpHYfX+szpg7Abm+X+4URZt 71ou00M3lu+7XrxqnU/KA3qL3XJ+1QwRjq3dnfJ6Liz2/jxSQvAJtgh+vTss5CWqV2ZL PgF0evFFXbPw+S26v4ZOGku9Ui/oT+e3ORtf86uw0Tqa9AYYWubVwYB2bqmZswxdH7Zi twIw== X-Gm-Message-State: ALoCoQkoJDNZ6+vFyU2oHSDzkQ9kYQp43BAvTRkW/Ck4nepwFjU4vDcC0a3M6w0U64q8ioei5kLm X-Received: by 10.180.106.197 with SMTP id gw5mr3588742wib.7.1444150972252; Tue, 06 Oct 2015 10:02:52 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.20.203 with SMTP id 72ls572959lfu.95.gmail; Tue, 06 Oct 2015 10:02:52 -0700 (PDT) X-Received: by 10.112.142.9 with SMTP id rs9mr15027501lbb.39.1444150972063; Tue, 06 Oct 2015 10:02:52 -0700 (PDT) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id dw9si21622921lbc.71.2015.10.06.10.02.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Oct 2015 10:02:52 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by lbcao8 with SMTP id ao8so80251384lbc.3 for ; Tue, 06 Oct 2015 10:02:52 -0700 (PDT) X-Received: by 10.25.28.73 with SMTP id c70mr8038230lfc.76.1444150971936; Tue, 06 Oct 2015 10:02:51 -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 w3csp1964014lbq; Tue, 6 Oct 2015 10:02:50 -0700 (PDT) X-Received: by 10.69.10.133 with SMTP id ea5mr18774078pbd.2.1444150970478; Tue, 06 Oct 2015 10:02:50 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qp7si50271071pbc.93.2015.10.06.10.02.50; Tue, 06 Oct 2015 10:02:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 S1752804AbbJFRCs (ORCPT + 30 others); Tue, 6 Oct 2015 13:02:48 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:35925 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751906AbbJFRCp (ORCPT ); Tue, 6 Oct 2015 13:02:45 -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 t96H2FdA001414; Tue, 6 Oct 2015 12:02:15 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id t96H2F0S014575; Tue, 6 Oct 2015 12:02:15 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.224.2; Tue, 6 Oct 2015 12:02: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 t96H2EsO018001; Tue, 6 Oct 2015 12:02:15 -0500 From: Felipe Balbi To: Tony Lindgren CC: Linux OMAP Mailing List , Linux ARM Kernel Mailing List , , , Linux Kernel Mailing List , Felipe Balbi Subject: [PATCH 03/11] arm: omap2: timer: remove __omap_gptimer_init() Date: Tue, 6 Oct 2015 12:01:59 -0500 Message-ID: <1444150927-14771-4-git-send-email-balbi@ti.com> X-Mailer: git-send-email 2.5.3 In-Reply-To: <1444150927-14771-1-git-send-email-balbi@ti.com> References: <1444150927-14771-1-git-send-email-balbi@ti.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@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.182 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