Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0af85dda authored by Russell King's avatar Russell King
Browse files

ARM: vexpress: add sched_clock() for Versatile Express 



Add a sched_clock() implementation to Versatile Express using the new
sched_clock() infrastructure for extending 32bit counters to full
64-bit nanoseconds.

Tested-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1da0c89c

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ config ARCH_VEXPRESS 
	select COMMON_CLKDEV

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select HAVE_SCHED_CLOCK

	select ICST

	select PLAT_VERSATILE

	help

arch/arm/mach-vexpress/v2m.c

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include <mach/clkdev.h>

#include <mach/motherboard.h>



#include <plat/sched_clock.h>



#include <plat/timer-sp.h>



#include "core.h"
@@ -50,6 +52,8 @@ void __init v2m_map_io(struct map_desc *tile, size_t num) 


static void __init v2m_timer_init(void)

{

	versatile_sched_clock_init(MMIO_P2V(V2M_SYS_24MHZ), 24000000);



	writel(0, MMIO_P2V(V2M_TIMER0) + TIMER_CTRL);

	writel(0, MMIO_P2V(V2M_TIMER1) + TIMER_CTRL);

arch/arm/plat-versatile/Makefile

+3 −2
Original line number Diff line number Diff line 
obj-y	:= clock.o

obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o

obj-$(CONFIG_ARCH_REALVIEW) += sched-clock.o

obj-$(CONFIG_ARCH_VERSATILE) += sched-clock.o

ifneq ($(CONFIG_ARCH_INTEGRATOR),y)

obj-y	+= sched-clock.o

endif

ifeq ($(CONFIG_LEDS_CLASS),y)

obj-$(CONFIG_ARCH_REALVIEW) += leds.o

obj-$(CONFIG_ARCH_VERSATILE) += leds.o