diff options
author | Stefan Roese <sr@denx.de> | 2008-09-08 10:35:49 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2008-09-08 10:35:49 +0200 |
commit | c351575c226eaad85f12b0d346e762260b263531 (patch) | |
tree | c2c1748a95c589278cbf048c191728fd5a9ea753 /drivers/rtc/ds1306.c | |
parent | ac53ee8318678190bf3c68da477a84a657d86fb0 (diff) | |
parent | 302e52e0b1d4c7f994991709d0cb6c3ea612cdb5 (diff) | |
download | u-boot-imx-c351575c226eaad85f12b0d346e762260b263531.zip u-boot-imx-c351575c226eaad85f12b0d346e762260b263531.tar.gz u-boot-imx-c351575c226eaad85f12b0d346e762260b263531.tar.bz2 |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'drivers/rtc/ds1306.c')
-rw-r--r-- | drivers/rtc/ds1306.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/rtc/ds1306.c b/drivers/rtc/ds1306.c index 12528ed..03c4089 100644 --- a/drivers/rtc/ds1306.c +++ b/drivers/rtc/ds1306.c @@ -141,7 +141,7 @@ int rtc_get (struct rtc_time *tmp) /* ------------------------------------------------------------------------- */ /* set clock time in DS1306 RTC and in MPC8xx RTC */ -void rtc_set (struct rtc_time *tmp) +int rtc_set (struct rtc_time *tmp) { volatile immap_t *immap = (immap_t *) CFG_IMMR; @@ -209,6 +209,8 @@ void rtc_set (struct rtc_time *tmp) debug ("Set 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 0; } /* ------------------------------------------------------------------------- */ @@ -371,7 +373,7 @@ int rtc_get (struct rtc_time *tmp) /* ------------------------------------------------------------------------- */ /* set clock time from *tmp in DS1306 RTC */ -void rtc_set (struct rtc_time *tmp) +int rtc_set (struct rtc_time *tmp) { /* Assuming Vcc = 2.0V (lowest speed) */ if (!slave) { |