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

Commit 739b2711 authored by John Stultz's avatar John Stultz Committed by Thomas Gleixner
Browse files

frv: Convert frv to use read/update_persistent_clock 



This patch converts the frv architecture to use the generic
read_persistent_clock and update_persistent_clock interfaces, reducing
the amount of arch specific code we have to maintain, and allowing for
further cleanups in the future.

I have not built or tested this patch, so help from arch maintainers
would be appreciated.

Signed-off-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <1267675049-12337-4-git-send-email-johnstul@us.ibm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent f7a56575

arch/frv/kernel/time.c

+7 −27
Original line number Diff line number Diff line
@@ -48,20 +48,12 @@ static struct irqaction timer_irq = { 
	.name = "timer",

};



static inline int set_rtc_mmss(unsigned long nowtime)

{

	return -1;

}



/*

 * timer_interrupt() needs to keep up the real-time clock,

 * as well as call the "do_timer()" routine every clocktick

 */

static irqreturn_t timer_interrupt(int irq, void *dummy)

{

	/* last time the cmos clock got updated */

	static long last_rtc_update = 0;



	profile_tick(CPU_PROFILING);

	/*

	 * Here we are in the timer irq handler. We just have irqs locally
@@ -74,22 +66,6 @@ static irqreturn_t timer_interrupt(int irq, void *dummy) 


	do_timer(1);



	/*

	 * If we have an externally synchronized Linux clock, then update

	 * CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be

	 * called as close as possible to 500 ms before the new second starts.

	 */

	if (ntp_synced() &&

	    xtime.tv_sec > last_rtc_update + 660 &&

	    (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 &&

	    (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2

	    ) {

		if (set_rtc_mmss(xtime.tv_sec) == 0)

			last_rtc_update = xtime.tv_sec;

		else

			last_rtc_update = xtime.tv_sec - 600; /* do it again in 60 s */

	}



#ifdef CONFIG_HEARTBEAT

	static unsigned short n;

	n++;
@@ -119,7 +95,8 @@ void time_divisor_init(void) 
	__set_TCSR_DATA(0, base >> 8);

}



void time_init(void)



void read_persistent_clock(struct timespec *ts)

{

	unsigned int year, mon, day, hour, min, sec;
@@ -135,9 +112,12 @@ void time_init(void) 


	if ((year += 1900) < 1970)

		year += 100;

	xtime.tv_sec = mktime(year, mon, day, hour, min, sec);

	xtime.tv_nsec = 0;

	ts->tv_sec = mktime(year, mon, day, hour, min, sec);

	ts->tv_nsec = 0;

}



void time_init(void)

{

	/* install scheduling interrupt handler */

	setup_irq(IRQ_CPU_TIMER0, &timer_irq);