projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GCC4.6: Squash warning in nand_bbt.c
[oweals/u-boot.git]
/
drivers
/
rtc
/
mpc8xx.c
diff --git
a/drivers/rtc/mpc8xx.c
b/drivers/rtc/mpc8xx.c
index 943506975da34806e055afaf05b8cf54dcdc98e4..1c24e59e425b5fb7795080e000a34cf093de1202 100644
(file)
--- a/
drivers/rtc/mpc8xx.c
+++ b/
drivers/rtc/mpc8xx.c
@@
-37,7
+37,7
@@
int rtc_get (struct rtc_time *tmp)
{
int rtc_get (struct rtc_time *tmp)
{
- volatile immap_t *immr = (immap_t *)C
FG
_IMMR;
+ volatile immap_t *immr = (immap_t *)C
ONFIG_SYS
_IMMR;
ulong tim;
tim = immr->im_sit.sit_rtc;
ulong tim;
tim = immr->im_sit.sit_rtc;
@@
-51,9
+51,9
@@
int rtc_get (struct rtc_time *tmp)
return 0;
}
return 0;
}
-
void
rtc_set (struct rtc_time *tmp)
+
int
rtc_set (struct rtc_time *tmp)
{
{
- volatile immap_t *immr = (immap_t *)C
FG
_IMMR;
+ volatile immap_t *immr = (immap_t *)C
ONFIG_SYS
_IMMR;
ulong tim;
debug ( "Set DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n",
ulong tim;
debug ( "Set DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n",
@@
-65,6
+65,8
@@
void rtc_set (struct rtc_time *tmp)
immr->im_sitk.sitk_rtck = KAPWR_KEY;
immr->im_sit.sit_rtc = tim;
immr->im_sitk.sitk_rtck = KAPWR_KEY;
immr->im_sit.sit_rtc = tim;
+
+ return 0;
}
void rtc_reset (void)
}
void rtc_reset (void)