@@ -237,6 +237,8 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
dev_info(dev, "rtc core: registered %s as %s\n",
rtc->name, dev_name(&rtc->dev));
+ rtc_hctosys();
+
return rtc;
exit_kfree:
@@ -22,7 +22,7 @@
* the best guess is to add 0.5s.
*/
-static int __init rtc_hctosys(void)
+int rtc_hctosys(void)
{
int err = -ENODEV;
struct rtc_time tm;
@@ -54,14 +54,13 @@ static int __init rtc_hctosys(void)
rtc_tm_to_time(&tm, &tv.tv_sec);
- err = do_settimeofday(&tv);
-
- dev_info(rtc->dev.parent,
- "setting system clock to "
- "%d-%02d-%02d %02d:%02d:%02d UTC (%u)\n",
- tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
- tm.tm_hour, tm.tm_min, tm.tm_sec,
- (unsigned int) tv.tv_sec);
+ if (!do_first_settimeofday(&tv))
+ dev_info(rtc->dev.parent,
+ "setting system clock to "
+ "%d-%02d-%02d %02d:%02d:%02d UTC (%u)\n",
+ tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
+ tm.tm_hour, tm.tm_min, tm.tm_sec,
+ (unsigned int) tv.tv_sec);
err_invalid:
err_read:
@@ -72,5 +71,3 @@ err_open:
return err;
}
-
-late_initcall(rtc_hctosys);
@@ -191,6 +191,12 @@ static inline bool is_leap_year(unsigned int year)
return (!(year % 4) && (year % 100)) || !(year % 400);
}
+#ifdef CONFIG_RTC_SYSTOHC
+int rtc_hctosys(void);
+#else
+#define rtc_hctosys() 0
+#endif
+
#ifdef CONFIG_RTC_HCTOSYS_DEVICE
extern int rtc_hctosys_ret;
#else
Rather then calling hctosys at late_init, when RTC modules may not yet be loaded, call hctosys on each RTC device registration. We also change hctosys to usilize do_first_settimeofday() in order to make sure the time is only initialized once by an RTC and doesn't overwrite any time changes already made by userspace. Cc: John Whitmore <arigead@gmail.com> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Alexander Holler <holler@ahsoftware.de> Signed-off-by: John Stultz <john.stultz@linaro.org> --- drivers/rtc/class.c | 2 ++ drivers/rtc/hctosys.c | 19 ++++++++----------- include/linux/rtc.h | 6 ++++++ 3 files changed, 16 insertions(+), 11 deletions(-)