Add powerpc get/set_rtc_time interface to new generic rtc class
PATCH 1/2 Add powerpc get/set_rtc_time interface to new generic rtc class
Add powerpc get/set_rtc_time interface to new generic rtc class. This abstracts rtc chip specific code from the platform code for rtc-over-i2c platforms. Specific RTC chip support is now configured under Device Drivers -> Real Time Clock. Setting time of day from the RTC on startup is also configurable.
this time without the potentially platform breaking initcall.
Signed-off-by Kim Phillips <[email protected]>
--- arch/powerpc/kernel/time.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/asm-powerpc/time.h | 6 +++++- 2 files changed, 47 insertions(+), 1 deletions(-)
arch/powerpc/kernel/time.c +42 -0
@@ -1048,6 +1048,48 @@ void __init time_init(void)set_dec (tb_ticks_per_jiffy); } +#ifdef CONFIG_RTC_CLASS +static int set_rtc_class_time (struct rtc_time *tm) +{ +int err; +struct class_device *class_dev = +rtc_class_open (CONFIG_RTC_HCTOSYS_DEVICE ); + +if (class_dev ==NULL ) +return -ENODEV ; + + err =rtc_set_time (class_dev, tm); + +rtc_class_close (class_dev); + +return 0 ; +} + +static void get_rtc_class_time (struct rtc_time *tm) +{ +int err; +struct class_device *class_dev = +rtc_class_open (CONFIG_RTC_HCTOSYS_DEVICE ); + +if (class_dev ==NULL ) +return ; + + err =rtc_read_time (class_dev, tm); + +rtc_class_close (class_dev); + +return ; +} + +int __init rtc_class_hookup (void ) +{ + ppc_md.get_rtc_time = get_rtc_class_time; + ppc_md.set_rtc_time = set_rtc_class_time; + +return 0 ; +} +#endif /* CONFIG_RTC_CLASS */ +#define FEBRUARY 2#define STARTOFTIME 1970
include/asm-powerpc/time.h +5 -1
@@ -39,6 +39,10 @@ extern void generic_calibrate_decr(void)extern void wakeup_decrementer (void );extern void snapshot_timebase (void ); +#ifdef CONFIG_RTC_CLASS +extern int __init rtc_class_hookup (void ); +#endif +/* Some sane defaults: 125 MHz timebase, 1GHz processor */ extern unsigned long ppc_proc_freq;#define DEFAULT_PROC_FREQ (DEFAULT_TB_FREQ * 8)
@@ -234,4 +238,4 @@ #define snapshot_timebases() do { } wh#endif #endif /* __KERNEL__ */ -#endif /* __PPC64_TIME_H */ +#endif /* __POWERPC_TIME_H */
Signature · 1 line
1.4.2.1
On Tue, Sep 26, 2006 at 05:46:37PM -0500, Kim Phillips wrote:
[snip]
include/asm-powerpc/time.h extern void generic_calibrate_decr(void) · line 44
Quoted 9 lines
include/asm-powerpc/time.h +3
-0@@ -39,6 +39,10 @@ extern void generic_calibrate_decr(void)extern void wakeup_decrementer (void );extern void snapshot_timebase (void ); +#ifdef CONFIG_RTC_CLASS +extern int __init rtc_class_hookup (void ); +#endif
Conditional code doesn't usually get externs ifdef'd, unless I'm mistaken.
Signature · 1 line
Tom Rini