arm: mx6: use imx6_thermal driver

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

diff --git a/drivers/rtc/davinci.c b/drivers/rtc/davinci.c
index 8436cbf8e9039f479e1aad1768afdf886c77ed11..f862e2f951c451e1d7213e8d468232bcb262c281 100644 (file)
--- a/drivers/rtc/davinci.c
+++ b/drivers/rtc/davinci.c
@@ -2,60 +2,18 @@
  * (C) Copyright 2011 DENX Software Engineering GmbH
  * Heiko Schocher <hs@denx.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+
  */
 #include <common.h>
 #include <command.h>
 #include <rtc.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <asm/davinci_rtc.h>
 
 #if defined(CONFIG_CMD_DATE)
-struct davinci_rtc {
-       u_int32_t       second;
-       u_int32_t       minutes;
-       u_int32_t       hours;
-       u_int32_t       day;
-       u_int32_t       month; /* 0x10 */
-       u_int32_t       year;
-       u_int32_t       dotw;
-       u_int32_t       resv1;
-       u_int32_t       alarmsecond; /* 0x20 */
-       u_int32_t       alarmminute;
-       u_int32_t       alarmhour;
-       u_int32_t       alarmday;
-       u_int32_t       alarmmonth; /* 0x30 */
-       u_int32_t       alarmyear;
-       u_int32_t       resv2[2];
-       u_int32_t       ctrl; /* 0x40 */
-       u_int32_t       status;
-       u_int32_t       irq;
-};
-
-#define RTC_STATE_BUSY 0x01
-#define RTC_STATE_RUN  0x02
-
-#define davinci_rtc_base ((struct davinci_rtc *)DAVINCI_RTC_BASE)
-
 int rtc_get(struct rtc_time *tmp)
 {
-       struct davinci_rtc *rtc = davinci_rtc_base;
+       struct davinci_rtc *rtc = (struct davinci_rtc *)DAVINCI_RTC_BASE;
        unsigned long sec, min, hour, mday, wday, mon_cent, year;
        unsigned long status;
 
@@ -99,7 +57,7 @@ int rtc_get(struct rtc_time *tmp)
 
 int rtc_set(struct rtc_time *tmp)
 {
-       struct davinci_rtc *rtc = davinci_rtc_base;
+       struct davinci_rtc *rtc = (struct davinci_rtc *)DAVINCI_RTC_BASE;
 
        debug("Set DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
                tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
@@ -117,7 +75,7 @@ int rtc_set(struct rtc_time *tmp)
 
 void rtc_reset(void)
 {
-       struct davinci_rtc *rtc = davinci_rtc_base;
+       struct davinci_rtc *rtc = (struct davinci_rtc *)DAVINCI_RTC_BASE;
 
        /* run RTC counter */
        writel(0x01, &rtc->ctrl);