Merge branch '2019-07-17-master-imports'

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

diff --git a/drivers/rtc/mxsrtc.c b/drivers/rtc/mxsrtc.c
index 32ba8a3062ce07f1d2cb4db9af8dcd0ac2020e65..be899a925408c3f6ccfba9c9fab399fb89296926 100644 (file)
--- a/drivers/rtc/mxsrtc.c
+++ b/drivers/rtc/mxsrtc.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Freescale i.MX28 RTC Driver
  *
  * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
  * on behalf of DENX Software Engineering GmbH
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -43,7 +42,7 @@ int rtc_get(struct rtc_time *time)
        uint32_t secs;
 
        secs = readl(&rtc_regs->hw_rtc_seconds);
-       to_tm(secs, time);
+       rtc_to_tm(secs, time);
 
        return 0;
 }
@@ -52,8 +51,7 @@ int rtc_set(struct rtc_time *time)
 {
        uint32_t secs;
 
-       secs = mktime(time->tm_year, time->tm_mon, time->tm_mday,
-               time->tm_hour, time->tm_min, time->tm_sec);
+       secs = rtc_mktime(time);
 
        return mxs_rtc_set_time(secs);
 }