From patchwork Tue Sep 29 20:44:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 54254 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by patches.linaro.org (Postfix) with ESMTPS id 390E922B1E for ; Tue, 29 Sep 2015 20:46:32 +0000 (UTC) Received: by wicmn1 with SMTP id mn1sf11762765wic.1 for ; Tue, 29 Sep 2015 13:46:31 -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=KHNiIP/Vcm/K6QdkjvgR2pNNEhl1didfhuFqRVLdcoM=; b=K/aQVGgXOZBulp5AUEBiNapwWJrcnlOqnpyix3EK9D4kx7JCBUgt0DBgTIyf5GHe8B WKdQFyAGjfJaR7lOub0x6r5iH9aRfvrRr+JgaHQBGqtHJixaxiI8ERfEIDUkIl/A/2nI tVJCYlK2Uo+8NLumsXOR+GqD0CLfUILwkzpfhFPgXl5VdNJN37PPD8wi6ZtW14ogZpRm ZE/fkgskFIVS2K1TRS1irx1Pp61d6yPFMiM4uvWigFC0H4C8JZgIhkVCixSrWCQZ3HAq xcHYmWkmPOOadxM0jpug8nPuI6F4//xAA+lU13emhyLAeLZnUZ7ZTd1l2KfF+6hUuKit 0bIg== X-Gm-Message-State: ALoCoQlvHeT44x2whwX4plDHX6mRMSUQHVo4TPbbYqmXQtgYBd5ftih7Ch4+o9kNVCcJoPoM91YT X-Received: by 10.194.109.233 with SMTP id hv9mr2277wjb.1.1443559591525; Tue, 29 Sep 2015 13:46:31 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.21.234 with SMTP id y10ls2843lae.62.gmail; Tue, 29 Sep 2015 13:46:30 -0700 (PDT) X-Received: by 10.112.157.99 with SMTP id wl3mr8276lbb.98.1443559590969; Tue, 29 Sep 2015 13:46:30 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id q6si11815644lah.68.2015.09.29.13.46.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2015 13:46:30 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by laer8 with SMTP id r8so23162227lae.2 for ; Tue, 29 Sep 2015 13:46:30 -0700 (PDT) X-Received: by 10.152.7.38 with SMTP id g6mr6299laa.106.1443559590741; Tue, 29 Sep 2015 13:46:30 -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 w3csp2361607lbq; Tue, 29 Sep 2015 13:46:29 -0700 (PDT) X-Received: by 10.50.30.39 with SMTP id p7mr1582471igh.40.1443559589680; Tue, 29 Sep 2015 13:46:29 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q31si18841010ioi.93.2015.09.29.13.46.28; Tue, 29 Sep 2015 13:46:29 -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 S1754813AbbI2UqS (ORCPT + 30 others); Tue, 29 Sep 2015 16:46:18 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:40391 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752588AbbI2Uos (ORCPT ); Tue, 29 Sep 2015 16:44:48 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id t8TKiEe0006004; Tue, 29 Sep 2015 15:44:14 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8TKiEL7020419; Tue, 29 Sep 2015 15:44:14 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.224.2; Tue, 29 Sep 2015 15:44:15 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8TKiDNn023427; Tue, 29 Sep 2015 15:44:14 -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 06/11] arm: omap2: timer: always call clocksource_of_init() when DT Date: Tue, 29 Sep 2015 15:44:01 -0500 Message-ID: <1443559446-26969-7-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.50 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: , If booting with DT, let's make sure to always call clocksource_of_init() as this will make it easier to move timer code to drivers/clocksource in the future. Signed-off-by: Felipe Balbi --- arch/arm/mach-omap2/timer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index deccec2d6ed8..1ae563736b12 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -500,6 +500,9 @@ void __init omap_sync32k_timer_init(void) { __omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon", 2, "timer_sys_ck", NULL, false); + + if (of_have_populated_dt()) + clocksource_of_init(); } #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM43XX) @@ -523,7 +526,6 @@ void __init omap3_gptimer_timer_init(void) void __init omap4_local_timer_init(void) { omap_sync32k_timer_init(); - clocksource_of_init(); } #endif @@ -644,10 +646,8 @@ sysclk1_based: void __init omap5_realtime_timer_init(void) { - omap_sync32k_timer_init(); realtime_counter_init(); - - clocksource_of_init(); + omap_sync32k_timer_init(); } #endif /* CONFIG_SOC_OMAP5 || CONFIG_SOC_DRA7XX */