diff options
| author |   Huacai Chen <chenhc@lemote.com> | 2016-07-21 14:27:49 +0800 |
|---|---|---|
| committer |   Ralf Baechle <ralf@linux-mips.org> | 2016-07-24 11:59:48 +0200 |
| commit | 6dabf2b7a597a9613f0b8a2fcbe01e2a0a05c896 (patch) | |
| tree | b3da66eda3d243fd5b939b29c944e08c98e4e0c8 | |
| parent | MIPS: traps: return correct si code for accessing nonmapped addresses (diff) | |
| download | linux-dev-6dabf2b7a597a9613f0b8a2fcbe01e2a0a05c896.tar.xz linux-dev-6dabf2b7a597a9613f0b8a2fcbe01e2a0a05c896.zip | |
MIPS: Fix r4k clockevents registration
CPUFreq need min_delta_ticks/max_delta_ticks to be initialized, and
this can be done by clockevents_config_and_register().
Cc: stable@vger.kernel.org
Signed-off-by: Heiher <r@hev.cc>
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Cc: John Crispin <john@phrozen.org>
Cc: Steven J . Hill <Steven.Hill@imgtec.com>
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Cc: stable@vger.kernel.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/13817/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/kernel/cevt-r4k.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c index e4c21bbf9422..804d2a2a19fe 100644 --- a/arch/mips/kernel/cevt-r4k.c +++ b/arch/mips/kernel/cevt-r4k.c @@ -276,12 +276,7 @@ int r4k_clockevent_init(void) CLOCK_EVT_FEAT_C3STOP | CLOCK_EVT_FEAT_PERCPU; - clockevent_set_clock(cd, mips_hpt_frequency); - - /* Calculate the min / max delta */ - cd->max_delta_ns = clockevent_delta2ns(0x7fffffff, cd); min_delta = calculate_min_delta(); - cd->min_delta_ns = clockevent_delta2ns(min_delta, cd); cd->rating = 300; cd->irq = irq; @@ -289,7 +284,7 @@ int r4k_clockevent_init(void) cd->set_next_event = mips_next_event; cd->event_handler = mips_event_handler; - clockevents_register_device(cd); + clockevents_config_and_register(cd, mips_hpt_frequency, min_delta, 0x7fffffff); if (cp0_timer_irq_installed) return 0; |