Commit 4178bac4 authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth
Browse files

ARM: call of_clk_init from default time_init handler 



Most DT ARM machs require common clock providers initialized before timers.
Currently, arch/arm machs use .init_time to call of_clk_init right before
clocksource_of_init. This prevents to remove that callback and use the default
one instead.

This patch adds a call to of_clk_init() to the default .init_time callback
for COMMON_CLK enabled machs to allow to remove custom callbacks where applicable.
While at it, also reorder includes alphabetically.

Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
parent f44089a7

arch/arm/kernel/time.c

+17 −12
Original line number Diff line number Diff line
@@ -11,25 +11,26 @@ 
 *  This file contains the ARM-specific time handling details:

 *  reading the RTC at bootup, etc...

 */

#include <linux/clk-provider.h>

#include <linux/clocksource.h>

#include <linux/errno.h>

#include <linux/export.h>

#include <linux/kernel.h>

#include <linux/interrupt.h>

#include <linux/time.h>

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/kernel.h>

#include <linux/profile.h>

#include <linux/sched.h>

#include <linux/sched_clock.h>

#include <linux/smp.h>

#include <linux/time.h>

#include <linux/timex.h>

#include <linux/errno.h>

#include <linux/profile.h>

#include <linux/timer.h>

#include <linux/clocksource.h>

#include <linux/irq.h>

#include <linux/sched_clock.h>



#include <asm/thread_info.h>

#include <asm/stacktrace.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <asm/stacktrace.h>

#include <asm/thread_info.h>



#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) || \

    defined(CONFIG_NVRAM) || defined(CONFIG_NVRAM_MODULE)
@@ -116,8 +117,12 @@ int __init register_persistent_clock(clock_access_fn read_boot, 


void __init time_init(void)

{

	if (machine_desc->init_time)

	if (machine_desc->init_time) {

		machine_desc->init_time();

	else

	} else {

#ifdef CONFIG_COMMON_CLK

		of_clk_init(NULL);

#endif

		clocksource_of_init();

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE