Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / drivers / rtc / x1205.c

diff --git a/drivers/rtc/x1205.c b/drivers/rtc/x1205.c
index 0e1813917fe4428e96fdb45fd517cf340db89c9b..7adf3770d515461fdb59fc3d242365925923f24b 100644 (file)
--- a/drivers/rtc/x1205.c
+++ b/drivers/rtc/x1205.c
@@ -38,9 +38,8 @@
 #include <command.h>
 #include <rtc.h>
 #include <i2c.h>
-#include <bcd.h>
 
-#if defined(CONFIG_RTC_X1205) && defined(CONFIG_CMD_DATE)
+#if defined(CONFIG_CMD_DATE)
 
 #define CCR_SEC                        0
 #define CCR_MIN                        1
@@ -96,7 +95,7 @@
 
 static void rtc_write(int reg, u8 val)
 {
-       i2c_write(CFG_I2C_RTC_ADDR, reg, 2, &val, 1);
+       i2c_write(CONFIG_SYS_I2C_RTC_ADDR, reg, 2, &val, 1);
 }
 
 /*
@@ -108,7 +107,7 @@ int rtc_get(struct rtc_time *tm)
 {
        u8 buf[8];
 
-       i2c_read(CFG_I2C_RTC_ADDR, X1205_CCR_BASE, 2, buf, 8);
+       i2c_read(CONFIG_SYS_I2C_RTC_ADDR, X1205_CCR_BASE, 2, buf, 8);
 
        debug("%s: raw read data - sec=%02x, min=%02x, hr=%02x, "
              "mday=%02x, mon=%02x, year=%02x, wday=%02x, y2k=%02x\n",
@@ -116,13 +115,13 @@ int rtc_get(struct rtc_time *tm)
              buf[0], buf[1], buf[2], buf[3],
              buf[4], buf[5], buf[6], buf[7]);
 
-       tm->tm_sec = BCD2BIN(buf[CCR_SEC]);
-       tm->tm_min = BCD2BIN(buf[CCR_MIN]);
-       tm->tm_hour = BCD2BIN(buf[CCR_HOUR] & 0x3F); /* hr is 0-23 */
-       tm->tm_mday = BCD2BIN(buf[CCR_MDAY]);
-       tm->tm_mon = BCD2BIN(buf[CCR_MONTH]); /* mon is 0-11 */
-       tm->tm_year = BCD2BIN(buf[CCR_YEAR])
-               + (BCD2BIN(buf[CCR_Y2K]) * 100);
+       tm->tm_sec = bcd2bin(buf[CCR_SEC]);
+       tm->tm_min = bcd2bin(buf[CCR_MIN]);
+       tm->tm_hour = bcd2bin(buf[CCR_HOUR] & 0x3F); /* hr is 0-23 */
+       tm->tm_mday = bcd2bin(buf[CCR_MDAY]);
+       tm->tm_mon = bcd2bin(buf[CCR_MONTH]); /* mon is 0-11 */
+       tm->tm_year = bcd2bin(buf[CCR_YEAR])
+               + (bcd2bin(buf[CCR_Y2K]) * 100);
        tm->tm_wday = buf[CCR_WDAY];
 
        debug("%s: tm is secs=%d, mins=%d, hours=%d, "
@@ -134,7 +133,7 @@ int rtc_get(struct rtc_time *tm)
        return 0;
 }
 
-void rtc_set(struct rtc_time *tm)
+int rtc_set(struct rtc_time *tm)
 {
        int i;
        u8 buf[8];
@@ -143,21 +142,21 @@ void rtc_set(struct rtc_time *tm)
              tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_wday,
              tm->tm_hour, tm->tm_min, tm->tm_sec);
 
-       buf[CCR_SEC] = BIN2BCD(tm->tm_sec);
-       buf[CCR_MIN] = BIN2BCD(tm->tm_min);
+       buf[CCR_SEC] = bin2bcd(tm->tm_sec);
+       buf[CCR_MIN] = bin2bcd(tm->tm_min);
 
        /* set hour and 24hr bit */
-       buf[CCR_HOUR] = BIN2BCD(tm->tm_hour) | X1205_HR_MIL;
+       buf[CCR_HOUR] = bin2bcd(tm->tm_hour) | X1205_HR_MIL;
 
-       buf[CCR_MDAY] = BIN2BCD(tm->tm_mday);
+       buf[CCR_MDAY] = bin2bcd(tm->tm_mday);
 
        /* month, 1 - 12 */
-       buf[CCR_MONTH] = BIN2BCD(tm->tm_mon);
+       buf[CCR_MONTH] = bin2bcd(tm->tm_mon);
 
        /* year, since the rtc epoch*/
-       buf[CCR_YEAR] = BIN2BCD(tm->tm_year % 100);
+       buf[CCR_YEAR] = bin2bcd(tm->tm_year % 100);
        buf[CCR_WDAY] = tm->tm_wday & 0x07;
-       buf[CCR_Y2K] = BIN2BCD(tm->tm_year / 100);
+       buf[CCR_Y2K] = bin2bcd(tm->tm_year / 100);
 
        /* this sequence is required to unlock the chip */
        rtc_write(X1205_REG_SR, X1205_SR_WEL);
@@ -168,6 +167,8 @@ void rtc_set(struct rtc_time *tm)
                rtc_write(X1205_CCR_BASE + i, buf[i]);
 
        rtc_write(X1205_REG_SR, 0);
+
+       return 0;
 }
 
 void rtc_reset(void)