rtc: Use CONFIG_X86 instead of __I386__

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

diff --git a/drivers/rtc/at91sam9_rtt.c b/drivers/rtc/at91sam9_rtt.c
index de8e30d0d7ca6969fba033ea1cc0851a30effaec..18fb09d0acb1b8716e0356624a8b9be65eedafa4 100644 (file)
--- a/drivers/rtc/at91sam9_rtt.c
+++ b/drivers/rtc/at91sam9_rtt.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2010
  * Reinhard Meyer, reinhard.meyer@emk-elektronik.de
  *
- * 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+
  */
 
 /*
@@ -38,9 +22,9 @@
 #include <common.h>
 #include <command.h>
 #include <rtc.h>
-#include <asm/errno.h>
+#include <asm/io.h>
+#include <linux/errno.h>
 #include <asm/arch/hardware.h>
-#include <asm/arch/io.h>
 #include <asm/arch/at91_rtt.h>
 #include <asm/arch/at91_gpbr.h>
 
@@ -48,8 +32,8 @@
 
 int rtc_get (struct rtc_time *tmp)
 {
-       at91_rtt_t *rtt = (at91_rtt_t *) AT91_RTT_BASE;
-       at91_gpbr_t *gpbr = (at91_gpbr_t *) AT91_GPR_BASE;
+       at91_rtt_t *rtt = (at91_rtt_t *) ATMEL_BASE_RTT;
+       at91_gpbr_t *gpbr = (at91_gpbr_t *) ATMEL_BASE_GPBR;
        ulong tim;
        ulong tim2;
        ulong off;
@@ -60,18 +44,17 @@ int rtc_get (struct rtc_time *tmp)
        } while (tim!=tim2);
        off = readl(&gpbr->reg[AT91_GPBR_INDEX_TIMEOFF]);
        /* off==0 means time is invalid, but we ignore that */
-       to_tm (tim+off, tmp);
+       rtc_to_tm(tim+off, tmp);
        return 0;
 }
 
 int rtc_set (struct rtc_time *tmp)
 {
-       at91_rtt_t *rtt = (at91_rtt_t *) AT91_RTT_BASE;
-       at91_gpbr_t *gpbr = (at91_gpbr_t *) AT91_GPR_BASE;
+       at91_rtt_t *rtt = (at91_rtt_t *) ATMEL_BASE_RTT;
+       at91_gpbr_t *gpbr = (at91_gpbr_t *) ATMEL_BASE_GPBR;
        ulong tim;
 
-       tim = mktime (tmp->tm_year, tmp->tm_mon, tmp->tm_mday,
-                     tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+       tim = rtc_mktime(tmp);
 
        /* clear alarm, set prescaler to 32768, clear counter */
        writel(32768+AT91_RTT_RTTRST, &rtt->mr);
@@ -85,8 +68,8 @@ int rtc_set (struct rtc_time *tmp)
 
 void rtc_reset (void)
 {
-       at91_rtt_t *rtt = (at91_rtt_t *) AT91_RTT_BASE;
-       at91_gpbr_t *gpbr = (at91_gpbr_t *) AT91_GPR_BASE;
+       at91_rtt_t *rtt = (at91_rtt_t *) ATMEL_BASE_RTT;
+       at91_gpbr_t *gpbr = (at91_gpbr_t *) ATMEL_BASE_GPBR;
 
        /* clear alarm, set prescaler to 32768, clear counter */
        writel(32768+AT91_RTT_RTTRST, &rtt->mr);