diff options
author | Gerald Van Baren <vanbaren@cideas.com> | 2008-03-21 11:58:22 -0400 |
---|---|---|
committer | Gerald Van Baren <vanbaren@cideas.com> | 2008-03-21 11:58:22 -0400 |
commit | 01026a6e613e1cfe580122fb5350677025f896fa (patch) | |
tree | 5e5905f085107242093e39a5e2175622df1bb73a /drivers/rtc/isl1208.c | |
parent | 11abe45c48ec3485a6c1a5168ce8d79c3288adc1 (diff) | |
parent | 81a0ac62ea29f8252d0a714709d0ecfdbba2a15e (diff) | |
download | u-boot-imx-01026a6e613e1cfe580122fb5350677025f896fa.zip u-boot-imx-01026a6e613e1cfe580122fb5350677025f896fa.tar.gz u-boot-imx-01026a6e613e1cfe580122fb5350677025f896fa.tar.bz2 |
Merge git://www.denx.de/git/u-boot into uboot
Diffstat (limited to 'drivers/rtc/isl1208.c')
-rw-r--r-- | drivers/rtc/isl1208.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/rtc/isl1208.c b/drivers/rtc/isl1208.c index d872802..3d46fd0 100644 --- a/drivers/rtc/isl1208.c +++ b/drivers/rtc/isl1208.c @@ -73,8 +73,9 @@ static unsigned bcd2bin (uchar c); * Get the current time from the RTC */ -void rtc_get (struct rtc_time *tmp) +int rtc_get (struct rtc_time *tmp) { + int rel = 0; uchar sec, min, hour, mday, wday, mon, year, status; status = rtc_read (RTC_STAT_REG_ADDR); @@ -94,6 +95,7 @@ void rtc_get (struct rtc_time *tmp) printf ("### Warning: RTC oscillator has stopped\n"); rtc_write(RTC_STAT_REG_ADDR, rtc_read(RTC_STAT_REG_ADDR) &~ (RTC_STAT_BIT_BAT|RTC_STAT_BIT_RTCF)); + rel = -1; } tmp->tm_sec = bcd2bin (sec & 0x7F); @@ -109,6 +111,8 @@ void rtc_get (struct rtc_time *tmp) DEBUGR ("Get DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n", tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday, tmp->tm_hour, tmp->tm_min, tmp->tm_sec); + + return rel; } /* |