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

Commit ea158119 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: mmp: stop using mach/timex.h 



mach/timex.h is the last remaining header that is unused for multiarch
builds but necessary for singlearch builds. To allow to get rid of it
for singlearch builds, too, drop its usage in mmp arch code by
substituting CLOCK_TICK_RATE by a local cpp symbol.

Acked-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 5e3e2763

arch/arm/mach-mmp/time.c

+9 −3
Original line number Original line Diff line number Diff line
@@ -39,6 +39,12 @@ 




#include "clock.h"

#include "clock.h"





#ifdef CONFIG_CPU_MMP2

#define MMP_CLOCK_FREQ		6500000

#else

#define MMP_CLOCK_FREQ		3250000

#endif



#define TIMERS_VIRT_BASE	TIMERS1_VIRT_BASE

#define TIMERS_VIRT_BASE	TIMERS1_VIRT_BASE





#define MAX_DELTA		(0xfffffffe)

#define MAX_DELTA		(0xfffffffe)
@@ -195,14 +201,14 @@ void __init timer_init(int irq) 
{

{

	timer_config();

	timer_config();





	setup_sched_clock(mmp_read_sched_clock, 32, CLOCK_TICK_RATE);

	setup_sched_clock(mmp_read_sched_clock, 32, MMP_CLOCK_FREQ);





	ckevt.cpumask = cpumask_of(0);

	ckevt.cpumask = cpumask_of(0);





	setup_irq(irq, &timer_irq);

	setup_irq(irq, &timer_irq);





	clocksource_register_hz(&cksrc, CLOCK_TICK_RATE);

	clocksource_register_hz(&cksrc, MMP_CLOCK_FREQ);

	clockevents_config_and_register(&ckevt, CLOCK_TICK_RATE,

	clockevents_config_and_register(&ckevt, MMP_CLOCK_FREQ,

					MIN_DELTA, MAX_DELTA);

					MIN_DELTA, MAX_DELTA);

}

}