dm: rtc: Rename mktime() and reduce the number of parameters

[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..fc83049
--- a/drivers/rtc/pl031.c
+++ b/drivers/rtc/pl031.c
@@ -4,23 +4,7 @@
  *
  * reference linux-2.6.20.6/drivers/rtc/rtc-pl031.c
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -29,8 +13,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 +32,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 +59,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,14 +68,15 @@ 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 */
-       tim = mktime(tmp->tm_year, tmp->tm_mon, tmp->tm_mday,
-                       tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+       tim = rtc_mktime(tmp);
 
        RTC_WRITE_REG(RTC_LR, tim);
+
+       return -1;
 }
 
 /*
@@ -111,7 +96,7 @@ int rtc_get(struct rtc_time *tmp)
 
        tim = RTC_READ_REG(RTC_DR);
 
-       to_tm (tim, tmp);
+       rtc_to_tm(tim, tmp);
 
        debug ( "Get DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
                tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,