From patchwork Tue Sep 29 20:44:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 54252 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by patches.linaro.org (Postfix) with ESMTPS id 7CDB222B1E for ; Tue, 29 Sep 2015 20:46:09 +0000 (UTC) Received: by laer8 with SMTP id r8sf10516225lae.2 for ; Tue, 29 Sep 2015 13:46:08 -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=brgfDDe/wWpRUy6BZX0fmM4vcpKsX06N0N9bx1ToSMw=; b=OjY8vYwgtuO+saAJoJ8lNZbZQbzke5VOTRK2iXYoWGSwfDn+cN4grdACECRaiaygIj hXCkF+kiQJrAM8u4r2UHGBG01DANjMbKQl35m1ISi+cwrqQmaRvDu6yGpFe4ovC+32jn bcQD+6z/xa7FNgnEDbLYKfGmDlorNPYJsD7UzB+0uKhmvoCQg3JjQBYXyVWH8O8iLibd xHIwEzp/5qwK09zIdNrJ6gOjeh2PpW2H8IE8fzc22NLr3gTGThC3CuGUbJCb7kv+azHY gelMRm27bpMpqZgt2pvt4R1AuQbKpGtcCNLNgfbxVgOe4C156wWsGiw/WRH6iVWbTrhE bQbA== X-Gm-Message-State: ALoCoQlkM7J8sQYXys6h/JFicmod3jZ+2ch6JqTX/o40nBkSwO9IrH4U8kwxyEVbia9Ogf9eTxbC X-Received: by 10.181.29.103 with SMTP id jv7mr112299wid.0.1443559568410; Tue, 29 Sep 2015 13:46:08 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.33 with SMTP id x1ls2439lax.18.gmail; Tue, 29 Sep 2015 13:46:08 -0700 (PDT) X-Received: by 10.112.62.232 with SMTP id b8mr3177lbs.27.1443559568114; Tue, 29 Sep 2015 13:46:08 -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 x8si7009230lad.57.2015.09.29.13.46.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2015 13:46:08 -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 r8so23151477lae.2 for ; Tue, 29 Sep 2015 13:46:08 -0700 (PDT) X-Received: by 10.25.145.132 with SMTP id t126mr5168lfd.88.1443559567974; Tue, 29 Sep 2015 13:46:07 -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 w3csp2361449lbq; Tue, 29 Sep 2015 13:46:06 -0700 (PDT) X-Received: by 10.50.62.148 with SMTP id y20mr25235350igr.17.1443559566546; Tue, 29 Sep 2015 13:46:06 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ie16si1205001igb.16.2015.09.29.13.46.06; Tue, 29 Sep 2015 13:46:06 -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 S1754631AbbI2Up5 (ORCPT + 5 others); Tue, 29 Sep 2015 16:45:57 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:40392 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752590AbbI2Uos (ORCPT ); Tue, 29 Sep 2015 16:44:48 -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 t8TKiFsP006010; Tue, 29 Sep 2015 15:44: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 t8TKiFFa028252; Tue, 29 Sep 2015 15:44:15 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.224.2; Tue, 29 Sep 2015 15:44:16 -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 t8TKiEtl028756; Tue, 29 Sep 2015 15:44: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: [RFC/PATCH 07/11] arm: omap2: timer: remove omap4_local_timer_init Date: Tue, 29 Sep 2015 15:44:02 -0500 Message-ID: <1443559446-26969-8-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-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: , We're now always calling clocksource_of_init() whenever booting with DT, so we can use the generic omap_sync32k_timer_init() (which will be renamed in a follow-up patch) for OMAP4 as well. Signed-off-by: Felipe Balbi --- arch/arm/mach-omap2/board-generic.c | 4 ++-- arch/arm/mach-omap2/common.h | 1 - arch/arm/mach-omap2/timer.c | 8 -------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index d08191ffabd9..13f7df92baf4 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -235,7 +235,7 @@ DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)") .init_irq = omap_gic_of_init, .init_machine = omap_generic_init, .init_late = omap4430_init_late, - .init_time = omap4_local_timer_init, + .init_time = omap_sync32k_timer_init, .dt_compat = omap4_boards_compat, .restart = omap44xx_restart, MACHINE_END @@ -279,7 +279,7 @@ DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)") .init_late = am43xx_init_late, .init_irq = omap_gic_of_init, .init_machine = omap_generic_init, - .init_time = omap4_local_timer_init, + .init_time = omap_sync32k_timer_init, .dt_compat = am43_boards_compat, .restart = omap44xx_restart, MACHINE_END diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index 844ad031f7f0..bf42fc4e78f4 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -91,7 +91,6 @@ extern void omap2_init_common_infrastructure(void); extern void omap_sync32k_timer_init(void); extern void omap3_secure_sync32k_timer_init(void); extern void omap3_gptimer_timer_init(void); -extern void omap4_local_timer_init(void); #ifdef CONFIG_CACHE_L2X0 int omap_l2_cache_init(void); #define OMAP_L2C_AUX_CTRL (L2C_AUX_CTRL_SHARED_OVERRIDE | \ diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 1ae563736b12..86c726ba2dd9 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -521,14 +521,6 @@ void __init omap3_gptimer_timer_init(void) } #endif -#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \ - defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX) -void __init omap4_local_timer_init(void) -{ - omap_sync32k_timer_init(); -} -#endif - #if defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX) /*