Merge branch '2020-01-27-master-imports'

[oweals/u-boot.git] / drivers / rtc / ftrtc010.c

diff --git a/drivers/rtc/ftrtc010.c b/drivers/rtc/ftrtc010.c
index 713dad274f1cb5e938e613d72b5118864b2a66f3..b68ea223f7f8fc5a1fc85c1ce61e90e3ae6f14f8 100644 (file)
--- a/drivers/rtc/ftrtc010.c
+++ b/drivers/rtc/ftrtc010.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Faraday FTRTC010 Real Time Clock
  *
  * (C) Copyright 2009 Faraday Technology
  * Po-Yu Chuang <ratbert@faraday-tech.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <config.h>
@@ -86,7 +85,7 @@ int rtc_get(struct rtc_time *tmp)
        now = ftrtc010_time() + readl(&rtc->record);
 #endif
 
-       to_tm(now, tmp);
+       rtc_to_tm(now, tmp);
 
        return 0;
 }
@@ -104,8 +103,7 @@ int rtc_set(struct rtc_time *tmp)
              tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
              tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
 
-       new = mktime(tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_hour,
-                    tmp->tm_min, tmp->tm_sec);
+       new = rtc_mktime(tmp);
 
        now = ftrtc010_time();