From patchwork Tue Oct 6 17:02: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: 54542 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 8EA1622FC5 for ; Tue, 6 Oct 2015 17:02:50 +0000 (UTC) Received: by lana8 with SMTP id a8sf52723793lan.1 for ; Tue, 06 Oct 2015 10:02:49 -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=6c4D3DSMJupyvfVNfAUzWaar9mFJ9VB/E/Z3oV8+07s=; b=FWSBnddLM1wF/QdBL5YVqV+INmWWWheM/hjHNmvQlkyviw6ppfbUj9EuDUuGz2k/7G EOTepwFEK0kjzJwl6J33OeT3jbQtn3UjeT47Zxe9GXOJMsqbdJqJlaZeq9V3O7sFagOm okmcCfNDNUYGMhBpQKY2UUFaKPTeuB4Ezvx3kbCc5xXfT/3tKK3nX0iSAVVdi2FNsxs8 zMb0lezDn1gfo3lft7nSXWn4zMpYi3X0tmM60sRJWFzmeTUgl3TpcJQ/mcJ937xJcYzS k1YlbFjDYrBrT7qCjSsjYzEgR5RZpRmegDRSoiYfk7ahpTVTXcorLIeMWFVmIODGG2Zp /G2w== X-Gm-Message-State: ALoCoQmpCV4HHCXC3LgAffF1FyhicLPA+lKOYLDCf6vRfJ6Owv5nrSOJZz4l7DVmNXynvcwVhxlj X-Received: by 10.112.63.165 with SMTP id h5mr6782522lbs.18.1444150969136; Tue, 06 Oct 2015 10:02:49 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.85.81 with SMTP id j78ls626374lfb.81.gmail; Tue, 06 Oct 2015 10:02:49 -0700 (PDT) X-Received: by 10.112.135.164 with SMTP id pt4mr14951029lbb.107.1444150968995; Tue, 06 Oct 2015 10:02:48 -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 h6si21625564lfg.153.2015.10.06.10.02.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Oct 2015 10:02:48 -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 lacdq7 with SMTP id dq7so5643417lac.2 for ; Tue, 06 Oct 2015 10:02:48 -0700 (PDT) X-Received: by 10.25.77.133 with SMTP id a127mr10018150lfb.19.1444150968844; Tue, 06 Oct 2015 10:02:48 -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 w3csp1963992lbq; Tue, 6 Oct 2015 10:02:47 -0700 (PDT) X-Received: by 10.69.2.227 with SMTP id br3mr48401275pbd.9.1444150967710; Tue, 06 Oct 2015 10:02:47 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z6si50229316pbt.171.2015.10.06.10.02.47; Tue, 06 Oct 2015 10:02:47 -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 S1752647AbbJFRCq (ORCPT + 5 others); Tue, 6 Oct 2015 13:02:46 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:35923 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751829AbbJFRCp (ORCPT ); Tue, 6 Oct 2015 13:02:45 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id t96H2IKl001420; Tue, 6 Oct 2015 12:02:18 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id t96H2IU2002600; Tue, 6 Oct 2015 12:02:18 -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, 6 Oct 2015 12:02:19 -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 t96H2HP2006429; Tue, 6 Oct 2015 12:02:18 -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 06/11] arm: omap2: timer: always call clocksource_of_init() when DT Date: Tue, 6 Oct 2015 12:02:02 -0500 Message-ID: <1444150927-14771-7-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-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.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 dcc0f032e717..b523426f38a5 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) @@ -519,7 +522,6 @@ void __init omap3_gptimer_timer_init(void) void __init omap4_local_timer_init(void) { omap_sync32k_timer_init(); - clocksource_of_init(); } #endif @@ -640,10 +642,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 */