summaryrefslogtreecommitdiff
path: root/drivers/rtc/ds1337.c
diff options
context:
space:
mode:
authorGerald Van Baren <vanbaren@cideas.com>2008-03-21 11:42:54 -0400
committerGerald Van Baren <vanbaren@cideas.com>2008-03-21 11:42:54 -0400
commit493a2b1dc97367e904bf83869501f6290f3b374e (patch)
tree5e5905f085107242093e39a5e2175622df1bb73a /drivers/rtc/ds1337.c
parent11abe45c48ec3485a6c1a5168ce8d79c3288adc1 (diff)
parent81a0ac62ea29f8252d0a714709d0ecfdbba2a15e (diff)
downloadu-boot-imx-493a2b1dc97367e904bf83869501f6290f3b374e.zip
u-boot-imx-493a2b1dc97367e904bf83869501f6290f3b374e.tar.gz
u-boot-imx-493a2b1dc97367e904bf83869501f6290f3b374e.tar.bz2
Merge git://www.denx.de/git/u-boot into uboot
Diffstat (limited to 'drivers/rtc/ds1337.c')
-rw-r--r--drivers/rtc/ds1337.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/rtc/ds1337.c b/drivers/rtc/ds1337.c
index c636ac5..50ab446 100644
--- a/drivers/rtc/ds1337.c
+++ b/drivers/rtc/ds1337.c
@@ -84,8 +84,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_cent, year, control, status;
control = rtc_read (RTC_CTL_REG_ADDR);
@@ -107,6 +108,7 @@ void rtc_get (struct rtc_time *tmp)
/* clear the OSF flag */
rtc_write (RTC_STAT_REG_ADDR,
rtc_read (RTC_STAT_REG_ADDR) & ~RTC_STAT_BIT_OSF);
+ rel = -1;
}
tmp->tm_sec = bcd2bin (sec & 0x7F);
@@ -122,6 +124,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;
}