Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5c4f5264d503f0650c954a181b0ba255913bb382

Authored by Greg Ungerer
Committed by Linus Torvalds
1 parent 3699522387
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

m68knommu: fix tick timer definition for coldfire 

CLOCK_TICK_RATE should give the underlying frequency of the tick timer,
to make ntp happy.  For Coldfires, that's the main clock.

Signed-off-by: Philippe De Muyter <phdm@macqel.be>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 23 additions and 1 deletions Side-by-side Diff

include/asm-m68knommu/timex.h
Diff comments   View file @ 5c4f526
1   -#include <asm-m68k/timex.h>
  1 +/*
  2 + * linux/include/asm-m68knommu/timex.h
  3 + *
  4 + * m68knommu architecture timex specifications
  5 + */
  6 +#ifndef _ASM_M68KNOMMU_TIMEX_H
  7 +#define _ASM_M68KNOMMU_TIMEX_H
  8 +
  9 +#ifdef CONFIG_COLDFIRE
  10 +#include <asm/coldfire.h>
  11 +#define CLOCK_TICK_RATE MCF_CLK
  12 +#else
  13 +#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */
  14 +#endif
  15 +
  16 +typedef unsigned long cycles_t;
  17 +
  18 +static inline cycles_t get_cycles(void)
  19 +{
  20 + return 0;
  21 +}
  22 +
  23 +#endif