rtc: imxdi: Initial support

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

diff --git a/drivers/rtc/pl031.c b/drivers/rtc/pl031.c
old mode 100755 (executable)
new mode 100644 (file)
index 276c184..8b2b174
--- a/drivers/rtc/pl031.c
+++ b/drivers/rtc/pl031.c
@@ -29,8 +29,8 @@
 
 #if defined(CONFIG_CMD_DATE)
 
-#ifndef CFG_RTC_PL031_BASE
-#error CFG_RTC_PL031_BASE is not defined!
+#ifndef CONFIG_SYS_RTC_PL031_BASE
+#error CONFIG_SYS_RTC_PL031_BASE is not defined!
 #endif
 
 /*
@@ -48,9 +48,9 @@
 #define RTC_CR_START   (1 << 0)
 
 #define        RTC_WRITE_REG(addr, val) \
-                       (*(volatile unsigned int *)(CFG_RTC_PL031_BASE + (addr)) = (val))
+                       (*(volatile unsigned int *)(CONFIG_SYS_RTC_PL031_BASE + (addr)) = (val))
 #define        RTC_READ_REG(addr)      \
-                       (*(volatile unsigned int *)(CFG_RTC_PL031_BASE + (addr)))
+                       (*(volatile unsigned int *)(CONFIG_SYS_RTC_PL031_BASE + (addr)))
 
 static int pl031_initted = 0;
 
@@ -75,7 +75,7 @@ void rtc_reset(void)
 /*
  * Set the RTC
 */
-void rtc_set(struct rtc_time *tmp)
+int rtc_set(struct rtc_time *tmp)
 {
        unsigned long tim;
 
@@ -84,7 +84,7 @@ void rtc_set(struct rtc_time *tmp)
 
        if (tmp == NULL) {
                puts("Error setting the date/time\n");
-               return;
+               return -1;
        }
 
        /* Calculate number of seconds this incoming time represents */
@@ -92,6 +92,8 @@ void rtc_set(struct rtc_time *tmp)
                        tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
 
        RTC_WRITE_REG(RTC_LR, tim);
+
+       return -1;
 }
 
 /*