Message ID | 1445012530-14126-8-git-send-email-balbi@ti.com |
---|---|
State | Accepted |
Commit | 9c46ffcd521474056629aea580a092559f721b32 |
Headers | show
Return-Path: <patchwork-forward+bncBC5M7T4HYEKRBYWIQSYQKGQEQ36ACVY@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id BB82122FFA for <linaro@patches.linaro.org>; Fri, 16 Oct 2015 16:22:58 +0000 (UTC) Received: by wibzt1 with SMTP id zt1sf4448220wib.0 for <linaro@patches.linaro.org>; Fri, 16 Oct 2015 09:22:58 -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=tppTOnqt3ypohycx7DAadQyJuhk9nXwMM4XyeNOUIHw=; b=Rn+ITvygjBmRl/5E6hZ4HaFbzlWttbmGu/ovHlQQt7h9er7wRJOhm9SLWw/1ZSViWb 9d4++PYvvieABsa+Fyx2qOgqy0aclMSCPrh+JPCYCyy78a6HO/vJKou4xTjmbFo618Cu +qleKZaBVZp1fO63FGNKIywf8Q2ko/n3tGn8Edb3+LPJnW3URYwOth5AUnCT2i15Ucoh dbuR/h3l0dVA4eMXXIf6WgEA6Oc7BCyg7KrvB3+OsCnCGoPrktdBD+3UdlzHsbpBgB20 Pa11B7ehNjOT2pVweMUL6r7qvPrOLhAXb9ySOrOO8IlzNsMf3j98yZZQXIBFnokAdTIK dLFw== X-Gm-Message-State: ALoCoQk8DgMW5R6hVXltu+RF0jx1aH9KqU0SL0fMkO/HxhHYwTtA0rKgbvuUf1Lub21KewIaG4eJ X-Received: by 10.180.210.212 with SMTP id mw20mr1363920wic.3.1445012578062; Fri, 16 Oct 2015 09:22:58 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.212.195 with SMTP id l186ls180109lfg.67.gmail; Fri, 16 Oct 2015 09:22:57 -0700 (PDT) X-Received: by 10.112.163.99 with SMTP id yh3mr8814402lbb.121.1445012577918; Fri, 16 Oct 2015 09:22:57 -0700 (PDT) Received: from mail-lf0-f46.google.com (mail-lf0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id as1si13366324lbc.94.2015.10.16.09.22.57 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Oct 2015 09:22:57 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by lfeh64 with SMTP id h64so78766660lfe.3 for <patchwork-forward@linaro.org>; Fri, 16 Oct 2015 09:22:57 -0700 (PDT) X-Received: by 10.25.82.10 with SMTP id g10mr5905332lfb.56.1445012577800; Fri, 16 Oct 2015 09:22:57 -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 w3csp17287lbq; Fri, 16 Oct 2015 09:22:56 -0700 (PDT) X-Received: by 10.107.160.196 with SMTP id j187mr19301577ioe.91.1445012564268; Fri, 16 Oct 2015 09:22:44 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e193si17094897ioe.131.2015.10.16.09.22.43; Fri, 16 Oct 2015 09:22:44 -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 S932255AbbJPQWn (ORCPT <rfc822;nicolas.dechesne@linaro.org> + 5 others); Fri, 16 Oct 2015 12:22:43 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:42387 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754353AbbJPQWl (ORCPT <rfc822; linux-omap@vger.kernel.org>); Fri, 16 Oct 2015 12:22:41 -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 t9GGMJrw008904; Fri, 16 Oct 2015 11:22:19 -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 t9GGMJrY028646; Fri, 16 Oct 2015 11:22:19 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.224.2; Fri, 16 Oct 2015 11:22:20 -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 t9GGMIXf023050; Fri, 16 Oct 2015 11:22:19 -0500 From: Felipe Balbi <balbi@ti.com> To: Tony Lindgren <tony@atomide.com> CC: Linux OMAP Mailing List <linux-omap@vger.kernel.org>, Linux ARM Kernel Mailing List <linux-arm-kernel@lists.infradead.org>, Felipe Balbi <balbi@ti.com> Subject: [PATCH 07/11] arm: omap2: timer: always call clocksource_of_init() when DT Date: Fri, 16 Oct 2015 11:22:06 -0500 Message-ID: <1445012530-14126-8-git-send-email-balbi@ti.com> X-Mailer: git-send-email 2.5.3 In-Reply-To: <1445012530-14126-1-git-send-email-balbi@ti.com> References: <1445012530-14126-1-git-send-email-balbi@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: <patchwork-forward.linaro.org> 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.46 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: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> |
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 8f2c75911179..851f3ad9e970 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -496,6 +496,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)
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 <balbi@ti.com> --- arch/arm/mach-omap2/timer.c | 3 +++ 1 file changed, 3 insertions(+)