Merge branch 'u-boot/master' into 'u-boot-arm/master'

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

diff --git a/drivers/rtc/mc146818.c b/drivers/rtc/mc146818.c
index 70f7017a3f4e46460a39f1dd0f9775e158f1370d..f7cf1064f9052de9b2e56fcc7de3d53544826efa 100644 (file)
--- a/drivers/rtc/mc146818.c
+++ b/drivers/rtc/mc146818.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2001
  * Denis Peter MPL AG Switzerland. d.peter@mpl.ch
  *
- * 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+
  */
 
 /*
@@ -31,28 +15,32 @@
 #include <command.h>
 #include <rtc.h>
 
-#if defined(CONFIG_RTC_MC146818) && defined(CONFIG_CMD_DATE)
+#if defined(__I386__) || defined(CONFIG_MALTA)
+#include <asm/io.h>
+#define in8(p) inb(p)
+#define out8(p, v) outb(v, p)
+#endif
+
+#if defined(CONFIG_CMD_DATE)
 
 static uchar rtc_read  (uchar reg);
 static void  rtc_write (uchar reg, uchar val);
-static uchar bin2bcd   (unsigned int n);
-static unsigned bcd2bin(uchar c);
-
-#define RTC_PORT_MC146818              CFG_ISA_IO_BASE_ADDRESS +  0x70
-#define RTC_SECONDS            0x00
-#define RTC_SECONDS_ALARM      0x01
-#define RTC_MINUTES                            0x02
-#define RTC_MINUTES_ALARM      0x03
-#define RTC_HOURS                                      0x04
-#define RTC_HOURS_ALARM                0x05
-#define RTC_DAY_OF_WEEK                0x06
-#define RTC_DATE_OF_MONTH      0x07
-#define RTC_MONTH                                      0x08
-#define RTC_YEAR                                               0x09
-#define RTC_CONFIG_A                           0x0A
-#define RTC_CONFIG_B                           0x0B
-#define RTC_CONFIG_C                           0x0C
-#define RTC_CONFIG_D                           0x0D
+
+#define RTC_PORT_MC146818      CONFIG_SYS_ISA_IO_BASE_ADDRESS +  0x70
+#define RTC_SECONDS            0x00
+#define RTC_SECONDS_ALARM      0x01
+#define RTC_MINUTES            0x02
+#define RTC_MINUTES_ALARM      0x03
+#define RTC_HOURS              0x04
+#define RTC_HOURS_ALARM                0x05
+#define RTC_DAY_OF_WEEK                0x06
+#define RTC_DATE_OF_MONTH      0x07
+#define RTC_MONTH              0x08
+#define RTC_YEAR               0x09
+#define RTC_CONFIG_A           0x0A
+#define RTC_CONFIG_B           0x0B
+#define RTC_CONFIG_C           0x0C
+#define RTC_CONFIG_D           0x0D
 
 
 /* ------------------------------------------------------------------------- */
@@ -62,16 +50,13 @@ int rtc_get (struct rtc_time *tmp)
        uchar sec, min, hour, mday, wday, mon, year;
   /* here check if rtc can be accessed */
        while((rtc_read(RTC_CONFIG_A)&0x80)==0x80);
-       sec             = rtc_read (RTC_SECONDS);
-       min             = rtc_read (RTC_MINUTES);
+       sec     = rtc_read (RTC_SECONDS);
+       min     = rtc_read (RTC_MINUTES);
        hour    = rtc_read (RTC_HOURS);
        mday    = rtc_read (RTC_DATE_OF_MONTH);
        wday    = rtc_read (RTC_DAY_OF_WEEK);
-       mon             = rtc_read (RTC_MONTH);
+       mon     = rtc_read (RTC_MONTH);
        year    = rtc_read (RTC_YEAR);
-#ifdef CONFIG_AMIGAONEG3SE
-       wday -= 1; /* VIA 686 stores Sunday = 1, Monday = 2, ... */
-#endif
 #ifdef RTC_DEBUG
        printf ( "Get RTC year: %02x mon/cent: %02x mday: %02x wday: %02x "
                "hr: %02x min: %02x sec: %02x\n",
@@ -105,7 +90,7 @@ int rtc_get (struct rtc_time *tmp)
        return 0;
 }
 
-void rtc_set (struct rtc_time *tmp)
+int rtc_set (struct rtc_time *tmp)
 {
 #ifdef RTC_DEBUG
        printf ( "Set DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
@@ -116,17 +101,14 @@ void rtc_set (struct rtc_time *tmp)
 
        rtc_write (RTC_YEAR, bin2bcd(tmp->tm_year % 100));
        rtc_write (RTC_MONTH, bin2bcd(tmp->tm_mon));
-#ifdef CONFIG_AMIGAONEG3SE
-       rtc_write (RTC_DAY_OF_WEEK, bin2bcd(tmp->tm_wday)+1);
-#else
        rtc_write (RTC_DAY_OF_WEEK, bin2bcd(tmp->tm_wday));
-#endif
        rtc_write (RTC_DATE_OF_MONTH, bin2bcd(tmp->tm_mday));
        rtc_write (RTC_HOURS, bin2bcd(tmp->tm_hour));
        rtc_write (RTC_MINUTES, bin2bcd(tmp->tm_min ));
        rtc_write (RTC_SECONDS, bin2bcd(tmp->tm_sec ));
        rtc_write(RTC_CONFIG_B,0x02); /* enables the RTC to update the regs */
 
+       return 0;
 }
 
 void rtc_reset (void)
@@ -140,18 +122,18 @@ void rtc_reset (void)
 
 /* ------------------------------------------------------------------------- */
 
-#ifdef CFG_RTC_REG_BASE_ADDR
+#ifdef CONFIG_SYS_RTC_REG_BASE_ADDR
 /*
  * use direct memory access
  */
 static uchar rtc_read (uchar reg)
 {
-       return(in8(CFG_RTC_REG_BASE_ADDR+reg));
+       return(in8(CONFIG_SYS_RTC_REG_BASE_ADDR+reg));
 }
 
 static void rtc_write (uchar reg, uchar val)
 {
-       out8(CFG_RTC_REG_BASE_ADDR+reg, val);
+       out8(CONFIG_SYS_RTC_REG_BASE_ADDR+reg, val);
 }
 #else
 static uchar rtc_read (uchar reg)
@@ -167,14 +149,4 @@ static void rtc_write (uchar reg, uchar val)
 }
 #endif
 
-static unsigned bcd2bin (uchar n)
-{
-       return ((((n >> 4) & 0x0F) * 10) + (n & 0x0F));
-}
-
-static unsigned char bin2bcd (unsigned int n)
-{
-       return (((n / 10) << 4) | (n % 10));
-}
-
 #endif