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-fdt
[oweals/u-boot.git]
/
drivers
/
rtc
/
isl1208.c
diff --git
a/drivers/rtc/isl1208.c
b/drivers/rtc/isl1208.c
index 3d46fd06532f5906f76b387c03f6b0d065a42be8..07591b7dba790afc2fc5f871826c280a599b7e0c 100644
(file)
--- a/
drivers/rtc/isl1208.c
+++ b/
drivers/rtc/isl1208.c
@@
-66,8
+66,6
@@
static uchar rtc_read (uchar reg);
static void rtc_write (uchar reg, uchar val);
static uchar rtc_read (uchar reg);
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
@@
-118,7
+116,7
@@
int rtc_get (struct rtc_time *tmp)
/*
* Set the RTC
*/
/*
* Set the RTC
*/
-
void
rtc_set (struct rtc_time *tmp)
+
int
rtc_set (struct rtc_time *tmp)
{
DEBUGR ("Set DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n",
tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
{
DEBUGR ("Set DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n",
tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
@@
-139,6
+137,8
@@
void rtc_set (struct rtc_time *tmp)
/* disable write */
rtc_write(RTC_STAT_REG_ADDR,
rtc_read(RTC_STAT_REG_ADDR) & ~RTC_STAT_BIT_WRTC);
/* disable write */
rtc_write(RTC_STAT_REG_ADDR,
rtc_read(RTC_STAT_REG_ADDR) & ~RTC_STAT_BIT_WRTC);
+
+ return 0;
}
void rtc_reset (void)
}
void rtc_reset (void)
@@
-151,20
+151,10
@@
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)
{
}
static void rtc_write (uchar reg, uchar val)
{
- i2c_reg_write (CFG_I2C_RTC_ADDR, reg, val);
-}
-
-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));
+ i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val);
}
}