summaryrefslogtreecommitdiff
path: root/drivers/rtc/bfin_rtc.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/bfin_rtc.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/bfin_rtc.c')
-rw-r--r--drivers/rtc/bfin_rtc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/rtc/bfin_rtc.c b/drivers/rtc/bfin_rtc.c
index 5755a20..ce4f171 100644
--- a/drivers/rtc/bfin_rtc.c
+++ b/drivers/rtc/bfin_rtc.c
@@ -85,7 +85,7 @@ void rtc_set(struct rtc_time *tmp)
}
/* Read the time from the RTC_STAT. time_in_seconds is seconds since Jan 1970 */
-void rtc_get(struct rtc_time *tmp)
+int rtc_get(struct rtc_time *tmp)
{
uint32_t cur_rtc_stat;
int time_in_sec;
@@ -95,7 +95,7 @@ void rtc_get(struct rtc_time *tmp)
if (tmp == NULL) {
puts("Error getting the date/time\n");
- return;
+ return -1;
}
wait_for_complete();
@@ -112,6 +112,8 @@ void rtc_get(struct rtc_time *tmp)
/* Calculate the total number of seconds since epoch */
time_in_sec = (tm_sec) + MIN_TO_SECS(tm_min) + HRS_TO_SECS(tm_hr) + DAYS_TO_SECS(tm_day);
to_tm(time_in_sec, tmp);
+
+ return 0;
}
#endif