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

Commit 746140c7 authored by Kevin Hilman's avatar Kevin Hilman Committed by Russell King
Browse files

[ARM] 3855/1: Add generic time support 



This patch adds Generic time-of-day support for the ARM architecture.

The support is currently added using #ifdef's so that it can support
sub-arches that do not (yet) have a clocksource added.  As sub-arches
add clocksource support, they should 'select GENERIC_TIME'

Signed-off-by: default avatarDeepak Saxena <dsaxena@mvista.com>
Signed-off-by: default avatarDaniel Walker <dwalker@mvista.com>

Signed-off-by: default avatarKevin Hilman <khilman@mvista.com>

Acked-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 82606c66

arch/arm/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ config ARM 
	  Europe.  There is an ARM Linux project with a web page at

	  <http://www.arm.linux.org.uk/>.



config GENERIC_TIME

	bool

	default n



config MMU

	bool

	default y

arch/arm/kernel/time.c

+6 −0
Original line number Diff line number Diff line
@@ -69,10 +69,12 @@ EXPORT_SYMBOL(profile_pc); 
 */

int (*set_rtc)(void);



#ifndef CONFIG_GENERIC_TIME

static unsigned long dummy_gettimeoffset(void)

{

	return 0;

}

#endif



/*

 * Scheduler clock - returns current time in nanosec units.
@@ -230,6 +232,7 @@ static inline void do_leds(void) 
#define	do_leds()

#endif



#ifndef CONFIG_GENERIC_TIME

void do_gettimeofday(struct timeval *tv)

{

	unsigned long flags;
@@ -291,6 +294,7 @@ int do_settimeofday(struct timespec *tv) 
}



EXPORT_SYMBOL(do_settimeofday);

#endif /* !CONFIG_GENERIC_TIME */



/**

 * save_time_delta - Save the offset between system time and RTC time
@@ -500,8 +504,10 @@ device_initcall(timer_init_sysfs); 


void __init time_init(void)

{

#ifndef CONFIG_GENERIC_TIME

	if (system_timer->offset == NULL)

		system_timer->offset = dummy_gettimeoffset;

#endif

	system_timer->init();



#ifdef CONFIG_NO_IDLE_HZ

include/asm-arm/mach/time.h

+2 −0
Original line number Diff line number Diff line
@@ -38,7 +38,9 @@ struct sys_timer { 
	void			(*init)(void);

	void			(*suspend)(void);

	void			(*resume)(void);

#ifndef CONFIG_GENERIC_TIME

	unsigned long		(*offset)(void);

#endif



#ifdef CONFIG_NO_IDLE_HZ

	struct dyn_tick_timer	*dyn_tick;

include/asm-arm/timeofday.h

0 → 100644
+4 −0
Original line number Diff line number Diff line 
#ifndef _ASM_ARM_TIMEOFDAY_H

#define _ASM_ARM_TIMEOFDAY_H

#include <asm-generic/timeofday.h>

#endif