projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename CFG_ macros to CONFIG_SYS
[oweals/u-boot.git]
/
drivers
/
rtc
/
ds1374.c
diff --git
a/drivers/rtc/ds1374.c
b/drivers/rtc/ds1374.c
index 130588ca1e75f17322b3bfddb4b1a06315a666fb..d61a2289f998015c45be8a1b75590512534749ab 100644
(file)
--- a/
drivers/rtc/ds1374.c
+++ b/
drivers/rtc/ds1374.c
@@
-48,11
+48,11
@@
#endif
/*---------------------------------------------------------------------*/
#endif
/*---------------------------------------------------------------------*/
-#ifndef C
FG
_I2C_RTC_ADDR
-# define C
FG_I2C_RTC_ADDR
0x68
+#ifndef C
ONFIG_SYS
_I2C_RTC_ADDR
+# define C
ONFIG_SYS_I2C_RTC_ADDR
0x68
#endif
#endif
-#if defined(CONFIG_RTC_DS1374) && (C
FG
_I2C_SPEED > 400000)
+#if defined(CONFIG_RTC_DS1374) && (C
ONFIG_SYS
_I2C_SPEED > 400000)
# error The DS1374 is specified up to 400kHz in fast mode!
#endif
# error The DS1374 is specified up to 400kHz in fast mode!
#endif
@@
-160,7
+160,7
@@
int rtc_get (struct rtc_time *tm){
/*
* Set the RTC
*/
/*
* Set the RTC
*/
-
void
rtc_set (struct rtc_time *tmp){
+
int
rtc_set (struct rtc_time *tmp){
unsigned long time;
unsigned i;
unsigned long time;
unsigned i;
@@
-186,6
+186,8
@@
void rtc_set (struct rtc_time *tmp){
/* Start clock */
rtc_write(RTC_CTL_ADDR, RTC_CTL_BIT_EN_OSC, FALSE);
/* Start clock */
rtc_write(RTC_CTL_ADDR, RTC_CTL_BIT_EN_OSC, FALSE);
+
+ return 0;
}
/*
}
/*
@@
-237,22
+239,22
@@
void rtc_reset (void){
*/
static uchar rtc_read (uchar reg)
{
*/
static uchar rtc_read (uchar reg)
{
- return (i2c_reg_read (C
FG
_I2C_RTC_ADDR, reg));
+ return (i2c_reg_read (C
ONFIG_SYS
_I2C_RTC_ADDR, reg));
}
static void rtc_write (uchar reg, uchar val, boolean_t set)
{
if (set == TRUE) {
}
static void rtc_write (uchar reg, uchar val, boolean_t set)
{
if (set == TRUE) {
- val |= i2c_reg_read (C
FG
_I2C_RTC_ADDR, reg);
- i2c_reg_write (C
FG
_I2C_RTC_ADDR, reg, val);
+ val |= i2c_reg_read (C
ONFIG_SYS
_I2C_RTC_ADDR, reg);
+ i2c_reg_write (C
ONFIG_SYS
_I2C_RTC_ADDR, reg, val);
} else {
} else {
- val = i2c_reg_read (C
FG
_I2C_RTC_ADDR, reg) & ~val;
- i2c_reg_write (C
FG
_I2C_RTC_ADDR, reg, val);
+ val = i2c_reg_read (C
ONFIG_SYS
_I2C_RTC_ADDR, reg) & ~val;
+ i2c_reg_write (C
ONFIG_SYS
_I2C_RTC_ADDR, reg, val);
}
}
static void rtc_write_raw (uchar reg, uchar val)
{
}
}
static void rtc_write_raw (uchar reg, uchar val)
{
- i2c_reg_write (C
FG
_I2C_RTC_ADDR, reg, val);
+ i2c_reg_write (C
ONFIG_SYS
_I2C_RTC_ADDR, reg, val);
}
#endif
}
#endif