From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752730AbbJFRCr (ORCPT ); Tue, 6 Oct 2015 13:02:47 -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 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 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 */ -- 2.5.3