diff options
| author | Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | 2011-03-16 19:05:37 -0400 |
|---|---|---|
| committer | Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> | 2011-03-16 19:05:37 -0400 |
| commit | a77ab15f39dc60f25eaecbcfb7f0f72af080df31 (patch) | |
| tree | b6eb719c98fd50afd692e40c8fa26542d144417e /arch/arm/plat-omap | |
| parent | 06ba662ed0e79388107d28254583e5641f71abe9 (diff) | |
arm-trace-clock-update-clocksource
arm trace clock update clocksource
* Differs from omap tree *
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/counter_32k.c | 5 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/clock.h | 2 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/trace-clock.h | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/counter_32k.c b/arch/arm/plat-omap/counter_32k.c index 862dda95d61..8627a516688 100644 --- a/arch/arm/plat-omap/counter_32k.c +++ b/arch/arm/plat-omap/counter_32k.c @@ -107,6 +107,11 @@ static struct clocksource clocksource_32k = { .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; +struct clocksource *get_clocksource_32k(void) +{ + return &clocksource_32k; +} + /* * Returns current time from boot in nsecs. It's OK for this to wrap * around for now, as it's just a relative time stamp. diff --git a/arch/arm/plat-omap/include/plat/clock.h b/arch/arm/plat-omap/include/plat/clock.h index 8eb0adab19e..2ad01f37a3c 100644 --- a/arch/arm/plat-omap/include/plat/clock.h +++ b/arch/arm/plat-omap/include/plat/clock.h @@ -297,4 +297,6 @@ extern const struct clkops clkops_null; extern struct clk dummy_ck; +struct clocksource *get_clocksource_32k(void); + #endif diff --git a/arch/arm/plat-omap/include/plat/trace-clock.h b/arch/arm/plat-omap/include/plat/trace-clock.h index 3c868f88803..344938d2a47 100644 --- a/arch/arm/plat-omap/include/plat/trace-clock.h +++ b/arch/arm/plat-omap/include/plat/trace-clock.h @@ -8,8 +8,7 @@ #define _ASM_ARM_TRACE_CLOCK_OMAP3_H #include <linux/clk.h> -#include <asm/system.h> -#include <plat/dmtimer.h> +#include <plat/clock.h> /* * Number of hardware clock bits. The higher order bits are expected to be 0. @@ -35,7 +34,6 @@ extern u64 trace_clock_read_synthetic_tsc(void); extern void _trace_clock_write_synthetic_tsc(u64 value); -extern struct omap_dm_timer *trace_clock_timer; extern unsigned long long cpu_hz; /* |