projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[oweals/u-boot.git]
/
drivers
/
rtc
/
rx8025.c
diff --git
a/drivers/rtc/rx8025.c
b/drivers/rtc/rx8025.c
index 9f4ce2f9adf2bb58591e934275d13f2ca797a4f7..64eb1cda105d8ea6730d2ee1fd083b6ddfb059dd 100644
(file)
--- a/
drivers/rtc/rx8025.c
+++ b/
drivers/rtc/rx8025.c
@@
-42,8
+42,8
@@
#endif
/*---------------------------------------------------------------------*/
#endif
/*---------------------------------------------------------------------*/
-#ifndef C
FG
_I2C_RTC_ADDR
-# define C
FG_I2C_RTC_ADDR
0x32
+#ifndef C
ONFIG_SYS
_I2C_RTC_ADDR
+# define C
ONFIG_SYS_I2C_RTC_ADDR
0x32
#endif
/*
#endif
/*
@@
-90,8
+90,6
@@
#define rtc_read(reg) buf[((reg) + 1) & 0xf]
static void rtc_write (uchar reg, uchar val);
#define rtc_read(reg) buf[((reg) + 1) & 0xf]
static void rtc_write (uchar reg, uchar val);
-static uchar bin2bcd (unsigned int n);
-static unsigned bcd2bin (uchar c);
/*
* Get the current time from the RTC
/*
* Get the current time from the RTC
@@
-102,7
+100,7
@@
int rtc_get (struct rtc_time *tmp)
uchar sec, min, hour, mday, wday, mon, year, ctl2;
uchar buf[16];
uchar sec, min, hour, mday, wday, mon, year, ctl2;
uchar buf[16];
- if (i2c_read(C
FG
_I2C_RTC_ADDR, 0, 0, buf, 16))
+ if (i2c_read(C
ONFIG_SYS
_I2C_RTC_ADDR, 0, 0, buf, 16))
printf("Error reading from RTC\n");
sec = rtc_read(RTC_SEC_REG_ADDR);
printf("Error reading from RTC\n");
sec = rtc_read(RTC_SEC_REG_ADDR);
@@
-189,7
+187,7
@@
void rtc_reset (void)
uchar buf[16];
uchar ctl2;
uchar buf[16];
uchar ctl2;
- if (i2c_read(C
FG
_I2C_RTC_ADDR, 0, 0, buf, 16))
+ if (i2c_read(C
ONFIG_SYS
_I2C_RTC_ADDR, 0, 0, buf, 16))
printf("Error reading from RTC\n");
ctl2 = rtc_read(RTC_CTL2_REG_ADDR);
printf("Error reading from RTC\n");
ctl2 = rtc_read(RTC_CTL2_REG_ADDR);
@@
-221,19
+219,9
@@
static void rtc_write (uchar reg, uchar val)
uchar buf[2];
buf[0] = reg << 4;
buf[1] = val;
uchar buf[2];
buf[0] = reg << 4;
buf[1] = val;
- if (i2c_write(C
FG
_I2C_RTC_ADDR, 0, 0, buf, 2) != 0)
+ if (i2c_write(C
ONFIG_SYS
_I2C_RTC_ADDR, 0, 0, buf, 2) != 0)
printf("Error writing to RTC\n");
}
printf("Error writing to RTC\n");
}
-static unsigned bcd2bin (uchar n)
-{
- return ((((n >> 4) & 0x0F) * 10) + (n & 0x0F));
-}
-
-static unsigned char bin2bcd (unsigned int n)
-{
- return (((n / 10) << 4) | (n % 10));
-}
-
#endif /* CONFIG_RTC_RX8025 && CONFIG_CMD_DATE */
#endif /* CONFIG_RTC_RX8025 && CONFIG_CMD_DATE */