rename CFG_ macros to CONFIG_SYS

[u-boot] / drivers / rtc / rx8025.c

diff --git a/drivers/rtc/rx8025.c b/drivers/rtc/rx8025.c
index 9122f12fc07a9056908d5aa39c1700651ca1b0a4..da87394a085c15b41ddefd628d732da67d39d9e1 100644 (file)
--- a/drivers/rtc/rx8025.c
+++ b/drivers/rtc/rx8025.c
@@ -30,7 +30,7 @@
 #include <rtc.h>
 #include <i2c.h>
 
-#if defined(CONFIG_RTC_RX8025) && defined(CONFIG_CMD_DATE)
+#if defined(CONFIG_CMD_DATE)
 
 /*---------------------------------------------------------------------*/
 #undef DEBUG_RTC
@@ -42,8 +42,8 @@
 #endif
 /*---------------------------------------------------------------------*/
 
-#ifndef CFG_I2C_RTC_ADDR
-# define CFG_I2C_RTC_ADDR      0x32
+#ifndef CONFIG_SYS_I2C_RTC_ADDR
+# define CONFIG_SYS_I2C_RTC_ADDR       0x32
 #endif
 
 /*
@@ -96,12 +96,13 @@ static unsigned bcd2bin (uchar c);
 /*
  * Get the current time from the RTC
  */
-void rtc_get (struct rtc_time *tmp)
+int rtc_get (struct rtc_time *tmp)
 {
+       int rel = 0;
        uchar sec, min, hour, mday, wday, mon, year, ctl2;
        uchar buf[16];
 
-       if (i2c_read(CFG_I2C_RTC_ADDR, 0, 0, buf, 16))
+       if (i2c_read(CONFIG_SYS_I2C_RTC_ADDR, 0, 0, buf, 16))
                printf("Error reading from RTC\n");
 
        sec = rtc_read(RTC_SEC_REG_ADDR);
@@ -118,18 +119,28 @@ void rtc_get (struct rtc_time *tmp)
 
        /* dump status */
        ctl2 = rtc_read(RTC_CTL2_REG_ADDR);
-       if (ctl2 & RTC_CTL2_BIT_PON)
+       if (ctl2 & RTC_CTL2_BIT_PON) {
                printf("RTC: power-on detected\n");
+               rel = -1;
+       }
 
-       if (ctl2 & RTC_CTL2_BIT_VDET)
+       if (ctl2 & RTC_CTL2_BIT_VDET) {
                printf("RTC: voltage drop detected\n");
+               rel = -1;
+       }
 
-       if (!(ctl2 & RTC_CTL2_BIT_XST))
+       if (!(ctl2 & RTC_CTL2_BIT_XST)) {
                printf("RTC: oscillator stop detected\n");
+               rel = -1;
+       }
 
        tmp->tm_sec  = bcd2bin (sec & 0x7F);
        tmp->tm_min  = bcd2bin (min & 0x7F);
-       tmp->tm_hour = bcd2bin (hour & 0x3F);
+       if (rtc_read(RTC_CTL1_REG_ADDR) & RTC_CTL1_BIT_2412)
+               tmp->tm_hour = bcd2bin (hour & 0x3F);
+       else
+               tmp->tm_hour = bcd2bin (hour & 0x1F) % 12 +
+                              ((hour & 0x20) ? 12 : 0);
        tmp->tm_mday = bcd2bin (mday & 0x3F);
        tmp->tm_mon  = bcd2bin (mon & 0x1F);
        tmp->tm_year = bcd2bin (year) + ( bcd2bin (year) >= 70 ? 1900 : 2000);
@@ -140,12 +151,14 @@ void rtc_get (struct rtc_time *tmp)
        DEBUGR ("Get DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
                tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
                tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+
+       return rel;
 }
 
 /*
  * 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,
@@ -163,6 +176,8 @@ void rtc_set (struct rtc_time *tmp)
        rtc_write (RTC_SEC_REG_ADDR, bin2bcd (tmp->tm_sec));
 
        rtc_write (RTC_CTL1_REG_ADDR, RTC_CTL1_BIT_2412);
+
+       return 0;
 }
 
 /*
@@ -174,7 +189,7 @@ void rtc_reset (void)
        uchar buf[16];
        uchar ctl2;
 
-       if (i2c_read(CFG_I2C_RTC_ADDR, 0,    0,   buf, 16))
+       if (i2c_read(CONFIG_SYS_I2C_RTC_ADDR, 0,    0,   buf, 16))
                printf("Error reading from RTC\n");
 
        ctl2 = rtc_read(RTC_CTL2_REG_ADDR);
@@ -206,7 +221,7 @@ static void rtc_write (uchar reg, uchar val)
        uchar buf[2];
        buf[0] = reg << 4;
        buf[1] = val;
-       if (i2c_write(CFG_I2C_RTC_ADDR, 0, 0, buf, 2) != 0)
+       if (i2c_write(CONFIG_SYS_I2C_RTC_ADDR, 0, 0, buf, 2) != 0)
                printf("Error writing to RTC\n");
 
 }