Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq

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

diff --git a/drivers/rtc/mx27rtc.c b/drivers/rtc/mx27rtc.c
index ae6595b86037744f2153051410c6d4c215132add..563e8a4a3610da545394c852b5baa9dd1c00ba22 100644 (file)
--- a/drivers/rtc/mx27rtc.c
+++ b/drivers/rtc/mx27rtc.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Freescale i.MX27 RTC Driver
  *
  * Copyright (C) 2012 Philippe Reynes <tremyfr@yahoo.fr>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -30,7 +29,7 @@ int rtc_get(struct rtc_time *time)
 
        sec += min * 60 + hour * 3600 + day * 24 * 3600;
 
-       to_tm(sec, time);
+       rtc_to_tm(sec, time);
 
        return 0;
 }
@@ -40,8 +39,7 @@ int rtc_set(struct rtc_time *time)
        struct rtc_regs *rtc_regs = (struct rtc_regs *)IMX_RTC_BASE;
        uint32_t day, hour, min, sec;
 
-       sec = mktime(time->tm_year, time->tm_mon, time->tm_mday,
-               time->tm_hour, time->tm_min, time->tm_sec);
+       sec = rtc_mktime(time);
 
        day  = sec / (24 * 3600);
        sec  = sec % (24 * 3600);
@@ -62,9 +60,5 @@ int rtc_set(struct rtc_time *time)
 
 void rtc_reset(void)
 {
-       struct rtc_regs *rtc_regs = (struct rtc_regs *)IMX_RTC_BASE;
-
-       writel(0, &rtc_regs->dayr);
-       writel(0, &rtc_regs->hourmin);
-       writel(0, &rtc_regs->seconds);
+       /* nothing to do */
 }