From patchwork Tue Oct 6 17:02: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: 54544 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by patches.linaro.org (Postfix) with ESMTPS id 4CBE022FC5 for ; Tue, 6 Oct 2015 17:03:07 +0000 (UTC) Received: by lbwr8 with SMTP id r8sf50522662lbw.0 for ; Tue, 06 Oct 2015 10:03:06 -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=gNwGf2UPwGY1e9FogBjGCtgMxh4o4VM+mwSZRb1eFzM=; b=XIs6NGjZDS8kPmoTIoMbNi61OH2Z8PK6MwmuuUz6dDjJhzImId2XPdCUzeRRbmcvma EMVDfgVWsclqMmZ2BKQSLZlQvhJAU0uELmKqtNYY7cgUHvUNV7+skQHQubAyK0mGt2NG uLRLWcIxkG5vGyP4Mb8ARgejguOb5N7cU0bqZs/IkXwVxB1BmdRZyiY0udhjTDe93hqg wpb/4GDouokjo3HX7ysPe/NPVPuUSEZ8aEowr94BakeYORXK+N4RjEDT3TzcTqWAoOtE SDi5oDcb1l13VfF86knVN/E4GeJF0QlyypHVPf33Zgnw0i67zmp34JfuKkNMbKhQZlBM zCyw== X-Gm-Message-State: ALoCoQnZneZe6MiKsV29p2C73wQhN7N9olHciTfpNFDb914lpXQ/cWOaOH6rprpuimKj/NnzSiPe X-Received: by 10.112.142.195 with SMTP id ry3mr6786070lbb.22.1444150986178; Tue, 06 Oct 2015 10:03:06 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.144.6 with SMTP id s6ls645326lfd.91.gmail; Tue, 06 Oct 2015 10:03:06 -0700 (PDT) X-Received: by 10.112.138.70 with SMTP id qo6mr15205775lbb.101.1444150986007; Tue, 06 Oct 2015 10:03:06 -0700 (PDT) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id l129si21633449lfe.102.2015.10.06.10.03.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Oct 2015 10:03:05 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by lacdq7 with SMTP id dq7so5648155lac.2 for ; Tue, 06 Oct 2015 10:03:05 -0700 (PDT) X-Received: by 10.112.199.137 with SMTP id jk9mr15427735lbc.86.1444150985847; Tue, 06 Oct 2015 10:03:05 -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 w3csp1964136lbq; Tue, 6 Oct 2015 10:03:04 -0700 (PDT) X-Received: by 10.68.69.17 with SMTP id a17mr48080375pbu.10.1444150984577; Tue, 06 Oct 2015 10:03:04 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pr9si50289582pbc.59.2015.10.06.10.03.04; Tue, 06 Oct 2015 10:03:04 -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 S1752938AbbJFRCy (ORCPT + 30 others); Tue, 6 Oct 2015 13:02:54 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:56110 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751906AbbJFRCt (ORCPT ); Tue, 6 Oct 2015 13:02:49 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id t96H2J2j013562; Tue, 6 Oct 2015 12:02:19 -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 t96H2J3k014814; Tue, 6 Oct 2015 12:02:19 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.224.2; Tue, 6 Oct 2015 12:02:20 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id t96H2IV9006187; Tue, 6 Oct 2015 12:02:19 -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 07/11] arm: omap2: timer: remove omap4_local_timer_init Date: Tue, 6 Oct 2015 12:02:03 -0500 Message-ID: <1444150927-14771-8-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.215.42 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 871db0f0fa66..20d5e82ab6ee 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -228,7 +228,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 @@ -272,7 +272,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 b523426f38a5..f41e526ffa46 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -517,14 +517,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) /*