lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: vexpress: add sched_clock() for Versatile Express

Browse Source 
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: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
2010-12-15 21:58:50 +00:00
parent 1da0c89c66
commit 0af85dda39
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/Kconfig
View File

@@ -268,6 +268,7 @@ config ARCH_VEXPRESS
select COMMON_CLKDEV select COMMON_CLKDEV
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select HAVE_CLK select HAVE_CLK
select HAVE_SCHED_CLOCK
select ICST select ICST
select PLAT_VERSATILE select PLAT_VERSATILE
help help

4
arch/arm/mach-vexpress/v2m.c
View File

@@ -22,6 +22,8 @@
#include <mach/clkdev.h> #include <mach/clkdev.h>
#include <mach/motherboard.h> #include <mach/motherboard.h>
#include <plat/sched_clock.h>
#include <plat/timer-sp.h> #include <plat/timer-sp.h>
#include "core.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) 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_TIMER0) + TIMER_CTRL);
writel(0, MMIO_P2V(V2M_TIMER1) + TIMER_CTRL); writel(0, MMIO_P2V(V2M_TIMER1) + TIMER_CTRL);

5
arch/arm/plat-versatile/Makefile
View File

@@ -1,7 +1,8 @@
obj-y := clock.o obj-y := clock.o
obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o
obj-$(CONFIG_ARCH_REALVIEW) += sched-clock.o ifneq ($(CONFIG_ARCH_INTEGRATOR),y)
obj-$(CONFIG_ARCH_VERSATILE) += sched-clock.o obj-y += sched-clock.o
endif
ifeq ($(CONFIG_LEDS_CLASS),y) ifeq ($(CONFIG_LEDS_CLASS),y)
obj-$(CONFIG_ARCH_REALVIEW) += leds.o obj-$(CONFIG_ARCH_REALVIEW) += leds.o
obj-$(CONFIG_ARCH_VERSATILE) += leds.o obj-$(CONFIG_ARCH_VERSATILE) += leds.o