Merge remote-tracking branch 'u-boot-imx/master'

[karo-tx-uboot.git] / drivers / rtc / mcfrtc.c

diff --git a/drivers/rtc/mcfrtc.c b/drivers/rtc/mcfrtc.c
index 27386e586a6bed91850d0aaf0baec2fee97fdb46..8961ca4f8b6708fcf6989bf2561f1f10a11bbf83 100644 (file)
--- a/drivers/rtc/mcfrtc.c
+++ b/drivers/rtc/mcfrtc.c
@@ -2,28 +2,12 @@
  * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
  * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
  *
- * 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>
 
-#if defined(CONFIG_MCFRTC) && defined(CONFIG_CMD_DATE)
+#if defined(CONFIG_CMD_DATE)
 
 #include <command.h>
 #include <rtc.h>
@@ -32,16 +16,16 @@
 
 #undef RTC_DEBUG
 
-#ifndef CFG_MCFRTC_BASE
+#ifndef CONFIG_SYS_MCFRTC_BASE
 #error RTC_BASE is not defined!
 #endif
 
 #define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0)
 #define        STARTOFTIME             1970
 
-void rtc_get(struct rtc_time *tmp)
+int rtc_get(struct rtc_time *tmp)
 {
-       volatile rtc_t *rtc = (rtc_t *) (CFG_MCFRTC_BASE);
+       volatile rtc_t *rtc = (rtc_t *) (CONFIG_SYS_MCFRTC_BASE);
 
        int rtc_days, rtc_hrs, rtc_mins;
        int tim;
@@ -64,11 +48,13 @@ void rtc_get(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);
 #endif
+
+       return 0;
 }
 
-void rtc_set(struct rtc_time *tmp)
+int rtc_set(struct rtc_time *tmp)
 {
-       volatile rtc_t *rtc = (rtc_t *) (CFG_MCFRTC_BASE);
+       volatile rtc_t *rtc = (rtc_t *) (CONFIG_SYS_MCFRTC_BASE);
 
        static int month_days[12] = {
                31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
@@ -104,11 +90,13 @@ void rtc_set(struct rtc_time *tmp)
        rtc->days = days;
        rtc->hourmin = (tmp->tm_hour << 8) | tmp->tm_min;
        rtc->seconds = tmp->tm_sec;
+
+       return 0;
 }
 
 void rtc_reset(void)
 {
-       volatile rtc_t *rtc = (rtc_t *) (CFG_MCFRTC_BASE);
+       volatile rtc_t *rtc = (rtc_t *) (CONFIG_SYS_MCFRTC_BASE);
 
        if ((rtc->cr & RTC_CR_EN) == 0) {
                printf("real-time-clock was stopped. Now starting...\n");