Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6dabf2b7 authored by Huacai Chen's avatar Huacai Chen Committed by Ralf Baechle
Browse files

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: default avatarHeiher <r@hev.cc>
Signed-off-by: default avatarHuacai 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: default avatarRalf Baechle <ralf@linux-mips.org>
parent bcfc8f0d

arch/mips/kernel/cevt-r4k.c

+1 −6
Original line number Diff line number Diff line
@@ -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;