From patchwork Tue Sep 29 20:43:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 54250 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 06EF822B1E for ; Tue, 29 Sep 2015 20:45:26 +0000 (UTC) Received: by wicgb1 with SMTP id gb1sf11878274wic.3 for ; Tue, 29 Sep 2015 13:45:25 -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=dutK5vbmvG6BL7WUFyd/d/HfWtIP4pp15eO2/qtY2UI=; b=Yk2mio3VjwqYt5ir7yhm91U/EP7TQzQtLEZo2M7qcwmrIQhRX1C4ka+0+x8Xc8tx7p tg8rcFlIb5jd7iT8nhJF4YVygBAufUDd1ap73bqUXBdJ8q8q0QEpGyQtnlT9h28iYSxS ivTPq3T6nu6RInN9xsLPxEvgaL6euT3jXmwDXwnakwrclLiLZuVK/232XKOHAAOqdEhZ vMLCsI8ZHkWt83XC/uw0YKCdUywWQvssr0GvMm/MJVaDQPeg96bQlxh+HLNqV3ktXH+9 qqJ+JdufspJa3/8Bivxls4cdLmfjlsbV+ZVRtXbS/scqLW8ee2mKLJb63DCdnF973dRJ CDoQ== X-Gm-Message-State: ALoCoQnUoIQhRwZ93WxSsLRwRjoliOkxcV8GkjbYDlL23vRsB1CCqHPI0jf/sn+X18Z504NChxlA X-Received: by 10.180.35.132 with SMTP id h4mr4218847wij.5.1443559525374; Tue, 29 Sep 2015 13:45:25 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.45.8 with SMTP id i8ls2755lam.59.gmail; Tue, 29 Sep 2015 13:45:25 -0700 (PDT) X-Received: by 10.152.179.105 with SMTP id df9mr1730166lac.91.1443559525009; Tue, 29 Sep 2015 13:45:25 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id uk5si11780750lbb.90.2015.09.29.13.45.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2015 13:45:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by laer8 with SMTP id r8so23131924lae.2 for ; Tue, 29 Sep 2015 13:45:24 -0700 (PDT) X-Received: by 10.112.199.137 with SMTP id jk9mr8830lbc.86.1443559524844; Tue, 29 Sep 2015 13:45:24 -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 w3csp2361159lbq; Tue, 29 Sep 2015 13:45:23 -0700 (PDT) X-Received: by 10.67.5.102 with SMTP id cl6mr66909pad.4.1443559523832; Tue, 29 Sep 2015 13:45:23 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id hd5si40006770pbb.257.2015.09.29.13.45.22; Tue, 29 Sep 2015 13:45:23 -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 S1754367AbbI2UpO (ORCPT + 30 others); Tue, 29 Sep 2015 16:45:14 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:56228 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752451AbbI2Uop (ORCPT ); Tue, 29 Sep 2015 16:44:45 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id t8TKiBwg023544; Tue, 29 Sep 2015 15:44:11 -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 t8TKiBKA028088; Tue, 29 Sep 2015 15:44:11 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.224.2; Tue, 29 Sep 2015 15:44:12 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8TKiAQI028670; Tue, 29 Sep 2015 15:44:11 -0500 From: Felipe Balbi To: Tony Lindgren CC: Linux OMAP Mailing List , Linux ARM Kernel Mailing List , Linux Kernel Mailing List , , , Felipe Balbi Subject: [RFC/PATCH 03/11] arm: omap2: timer: remove __omap_gptimer_init() Date: Tue, 29 Sep 2015 15:43:58 -0500 Message-ID: <1443559446-26969-4-git-send-email-balbi@ti.com> X-Mailer: git-send-email 2.5.3 In-Reply-To: <1443559446-26969-1-git-send-email-balbi@ti.com> References: <1443559446-26969-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.215.44 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: , since now we can reuse __omap_sync32k_timer_init() for OMAP3-like devices, we can safely remove __omap_gptimer_init(). 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 4f9cd4b2e6b0..44db46ccd474 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -596,16 +596,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) @@ -647,8 +637,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