diff options
Diffstat (limited to 'arch/arc/kernel/setup.c')
| -rw-r--r-- | arch/arc/kernel/setup.c | 17 | 
1 files changed, 14 insertions, 3 deletions
diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c index 0385df77a697..3093fa898a23 100644 --- a/arch/arc/kernel/setup.c +++ b/arch/arc/kernel/setup.c @@ -10,6 +10,8 @@  #include <linux/fs.h>  #include <linux/delay.h>  #include <linux/root_dev.h> +#include <linux/clk-provider.h> +#include <linux/clocksource.h>  #include <linux/console.h>  #include <linux/module.h>  #include <linux/cpu.h> @@ -234,11 +236,11 @@ static char *arc_cpu_mumbojumbo(int cpu_id, char *buf, int len)  		       is_isa_arcompact() ? "ARCompact" : "ARCv2",  		       IS_AVAIL1(cpu->isa.be, "[Big-Endian]")); -	n += scnprintf(buf + n, len - n, "Timers\t\t: %s%s%s%s\nISA Extn\t: ", +	n += scnprintf(buf + n, len - n, "Timers\t\t: %s%s%s%s%s%s\nISA Extn\t: ",  		       IS_AVAIL1(cpu->extn.timer0, "Timer0 "),  		       IS_AVAIL1(cpu->extn.timer1, "Timer1 "), -		       IS_AVAIL2(cpu->extn.rtc, "Local-64-bit-Ctr ", -				 CONFIG_ARC_HAS_RTC)); +		       IS_AVAIL2(cpu->extn.rtc, "RTC [UP 64-bit] ", CONFIG_ARC_TIMERS_64BIT), +		       IS_AVAIL2(cpu->extn.gfrc, "GFRC [SMP 64-bit] ", CONFIG_ARC_TIMERS_64BIT));  	n += i = scnprintf(buf + n, len - n, "%s%s%s%s%s",  			   IS_AVAIL2(cpu->isa.atomic, "atomic ", CONFIG_ARC_HAS_LLSC), @@ -449,6 +451,15 @@ void __init setup_arch(char **cmdline_p)  	arc_unwind_init();  } +/* + * Called from start_kernel() - boot CPU only + */ +void __init time_init(void) +{ +	of_clk_init(NULL); +	clocksource_probe(); +} +  static int __init customize_machine(void)  {  	if (machine_desc->init_machine)  |