projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usb: Clear CMD_RUN while issuing CMD_RESET in ehci_reset()
[oweals/u-boot.git]
/
drivers
/
rtc
/
ds1302.c
diff --git
a/drivers/rtc/ds1302.c
b/drivers/rtc/ds1302.c
index 3a856c840ac78afaf37caa14ae3c8c04b203fabb..87ddd019168b701eb128bf17ff54dd6282f88829 100644
(file)
--- a/
drivers/rtc/ds1302.c
+++ b/
drivers/rtc/ds1302.c
@@
-9,7
+9,7
@@
#include <command.h>
#include <rtc.h>
#include <command.h>
#include <rtc.h>
-#if defined(CONFIG_
RTC_DS1302) && defined(CONFIG_
CMD_DATE)
+#if defined(CONFIG_CMD_DATE)
/* GPP Pins */
#define DATA 0x200
/* GPP Pins */
#define DATA 0x200
@@
-66,7
+66,7
@@
struct ds1302_st
unsigned char month:4;
unsigned char zero4:5;
unsigned char month:4;
unsigned char zero4:5;
- unsigned char day:3; /* day of week */
+ unsigned char day:3; /* day of week */
unsigned char year10:4;
unsigned char year:4;
unsigned char year10:4;
unsigned char year:4;
@@
-191,7
+191,7
@@
write_ser_drv(unsigned char addr, unsigned char *buf, int count)
void
rtc_init(void)
{
void
rtc_init(void)
{
- struct ds1302_st bbclk;
+ struct ds1302_st bbclk;
unsigned char b;
int mod;
unsigned char b;
int mod;
@@
-287,8
+287,7
@@
rtc_get(struct rtc_time *tmp)
return rel;
}
return rel;
}
-void
-rtc_set(struct rtc_time *tmp)
+int rtc_set(struct rtc_time *tmp)
{
struct ds1302_st bbclk;
unsigned char b=0;
{
struct ds1302_st bbclk;
unsigned char b=0;
@@
-326,6
+325,8
@@
rtc_set(struct rtc_time *tmp)
write_ser_drv(0x8e,&b,1); /* disable write protect */
write_ser_drv(0xbe,(unsigned char *)&bbclk, 8); /* write burst */
write_ser_drv(0x8e,&b,1); /* disable write protect */
write_ser_drv(0xbe,(unsigned char *)&bbclk, 8); /* write burst */
+
+ return 0;
}
#endif
}
#endif