Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9f14517bd6f38cf4b48d742a0ac5db9d17edecba

Authored by John Stultz
Committed by Chris Metcalf
1 parent 55922c9d1b
Exists in master and in 6 other branches 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

clocksource: tile: convert to use clocksource_register_hz 

Convert tile to use clocksource_register_hz.

CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>

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

arch/tile/kernel/time.c
Diff comments   View file @ 9f14517
... ... @@ -78,7 +78,6 @@
78 78 .rating = 300,
79 79 .read = clocksource_get_cycles,
80 80 .mask = CLOCKSOURCE_MASK(64),
81   - .shift = 22, /* typical value, e.g. x86 tsc uses this */
82 81 .flags = CLOCK_SOURCE_IS_CONTINUOUS,
83 82 };
84 83  
... ... @@ -91,8 +90,6 @@
91 90 cycles_per_sec = hv_sysconf(HV_SYSCONF_CPU_SPEED);
92 91 sched_clock_mult =
93 92 clocksource_hz2mult(cycles_per_sec, SCHED_CLOCK_SHIFT);
94   - cycle_counter_cs.mult =
95   - clocksource_hz2mult(cycles_per_sec, cycle_counter_cs.shift);
96 93 }
97 94  
98 95 void __init calibrate_delay(void)
... ... @@ -107,7 +104,7 @@
107 104 void __init time_init(void)
108 105 {
109 106 /* Initialize and register the clock source. */
110   - clocksource_register(&cycle_counter_cs);
  107 + clocksource_register_hz(&cycle_counter_cs, cycles_per_sec);
111 108  
112 109 /* Start up the tile-timer interrupt source on the boot cpu. */
113 110 setup_tile_timer();