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

Commit 797276ec authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[RTC] rtc-sa1100: remove dependence on asm/rtc.h 



Move the two functions rtc-sa1100 wants from the old ARM RTC library
into the rtc-sa1100 driver.

Acked-by: default avatarAlessandro Zummo <a.zummo@towertech.it>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7da285b6

drivers/rtc/rtc-sa1100.c

+36 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 


#include <asm/hardware.h>

#include <asm/irq.h>

#include <asm/rtc.h>



#ifdef CONFIG_ARCH_PXA

#include <asm/arch/pxa-regs.h>
@@ -47,6 +46,42 @@ static unsigned long rtc_freq = 1024; 
static struct rtc_time rtc_alarm;

static DEFINE_SPINLOCK(sa1100_rtc_lock);



static inline int rtc_periodic_alarm(struct rtc_time *tm)

{

	return  (tm->tm_year == -1) ||

		((unsigned)tm->tm_mon >= 12) ||

		((unsigned)(tm->tm_mday - 1) >= 31) ||

		((unsigned)tm->tm_hour > 23) ||

		((unsigned)tm->tm_min > 59) ||

		((unsigned)tm->tm_sec > 59);

}



/*

 * Calculate the next alarm time given the requested alarm time mask

 * and the current time.

 */

static void rtc_next_alarm_time(struct rtc_time *next, struct rtc_time *now, struct rtc_time *alrm)

{

	unsigned long next_time;

	unsigned long now_time;



	next->tm_year = now->tm_year;

	next->tm_mon = now->tm_mon;

	next->tm_mday = now->tm_mday;

	next->tm_hour = alrm->tm_hour;

	next->tm_min = alrm->tm_min;

	next->tm_sec = alrm->tm_sec;



	rtc_tm_to_time(now, &now_time);

	rtc_tm_to_time(next, &next_time);



	if (next_time < now_time) {

		/* Advance one day */

		next_time += 60 * 60 * 24;

		rtc_time_to_tm(next_time, next);

	}

}



static int rtc_update_alarm(struct rtc_time *alrm)

{

	struct rtc_time alarm_tm, now_tm;