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

Commit 1723f2a1 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'davinci/soc' into next/soc 



From Sekhar Nori:
* davinci/soc:
  ARM: davinci: convert to clockevents_config_and_register

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents 94f53f1f bf94d09d

arch/arm/mach-davinci/time.c

+2 −7
Original line number Original line Diff line number Diff line
@@ -331,7 +331,6 @@ static void davinci_set_mode(enum clock_event_mode mode, 




static struct clock_event_device clockevent_davinci = {

static struct clock_event_device clockevent_davinci = {

	.features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,

	.features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,

	.shift		= 32,

	.set_next_event	= davinci_set_next_event,

	.set_next_event	= davinci_set_next_event,

	.set_mode	= davinci_set_mode,

	.set_mode	= davinci_set_mode,

};

};
@@ -397,14 +396,10 @@ void __init davinci_timer_init(void) 




	/* setup clockevent */

	/* setup clockevent */

	clockevent_davinci.name = id_to_name[timers[TID_CLOCKEVENT].id];

	clockevent_davinci.name = id_to_name[timers[TID_CLOCKEVENT].id];

	clockevent_davinci.mult = div_sc(davinci_clock_tick_rate, NSEC_PER_SEC,

					 clockevent_davinci.shift);

	clockevent_davinci.max_delta_ns =

		clockevent_delta2ns(0xfffffffe, &clockevent_davinci);

	clockevent_davinci.min_delta_ns = 50000; /* 50 usec */





	clockevent_davinci.cpumask = cpumask_of(0);

	clockevent_davinci.cpumask = cpumask_of(0);

	clockevents_register_device(&clockevent_davinci);

	clockevents_config_and_register(&clockevent_davinci,

					davinci_clock_tick_rate, 1, 0xfffffffe);





	for (i=0; i< ARRAY_SIZE(timers); i++)

	for (i=0; i< ARRAY_SIZE(timers); i++)

		timer32_config(&timers[i]);

		timer32_config(&timers[i]);