Merge git://git.denx.de/u-boot-imx

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

diff --git a/drivers/rtc/mx27rtc.c b/drivers/rtc/mx27rtc.c
index 7628dec3a9a15a00b61610cc8f238beb7e9df72a..b42770e05bd92dd8795bf0dc0a895c7be0bb55a5 100644 (file)
--- a/drivers/rtc/mx27rtc.c
+++ b/drivers/rtc/mx27rtc.c
@@ -3,20 +3,7 @@
  *
  * Copyright (C) 2012 Philippe Reynes <tremyfr@yahoo.fr>
  *
- * 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>
@@ -43,7 +30,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;
 }
@@ -53,8 +40,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);
@@ -75,9 +61,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 */
 }