Merge branch 'buildman' of git://git.denx.de/u-boot-x86

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

diff --git a/drivers/rtc/s3c24x0_rtc.c b/drivers/rtc/s3c24x0_rtc.c
index 04de5ca545d52c88780e459bdd785a806d5e822f..187620ac896cdbebd1f429989a817588c5a3b712 100644 (file)
--- a/drivers/rtc/s3c24x0_rtc.c
+++ b/drivers/rtc/s3c24x0_rtc.c
@@ -1,24 +1,8 @@
 /*
  * (C) Copyright 2003
- * David Müller ELSOFT AG Switzerland. d.mueller@elsoft.ch
+ * David Müller ELSOFT AG Switzerland. d.mueller@elsoft.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+
  */
 
 /*
@@ -34,8 +18,7 @@
 
 #include <rtc.h>
 #include <asm/io.h>
-
-/*#define      DEBUG*/
+#include <linux/compiler.h>
 
 typedef enum {
        RTC_ENABLE,
@@ -49,11 +32,11 @@ static inline void SetRTC_Access(RTC_ACCESS a)
 
        switch (a) {
        case RTC_ENABLE:
-               writeb(readb(&rtc->RTCCON) | 0x01, &rtc->RTCCON);
+               writeb(readb(&rtc->rtccon) | 0x01, &rtc->rtccon);
                break;
 
        case RTC_DISABLE:
-               writeb(readb(&rtc->RTCCON) & ~0x01, &rtc->RTCCON);
+               writeb(readb(&rtc->rtccon) & ~0x01, &rtc->rtccon);
                break;
        }
 }
@@ -64,30 +47,31 @@ int rtc_get(struct rtc_time *tmp)
 {
        struct s3c24x0_rtc *rtc = s3c24x0_get_base_rtc();
        uchar sec, min, hour, mday, wday, mon, year;
-       uchar a_sec, a_min, a_hour, a_date, a_mon, a_year, a_armed;
+       __maybe_unused uchar a_sec, a_min, a_hour, a_date,
+                            a_mon, a_year, a_armed;
 
        /* enable access to RTC registers */
        SetRTC_Access(RTC_ENABLE);
 
        /* read RTC registers */
        do {
-               sec  = readb(&rtc->BCDSEC);
-               min  = readb(&rtc->BCDMIN);
-               hour = readb(&rtc->BCDHOUR);
-               mday = readb(&rtc->BCDDATE);
-               wday = readb(&rtc->BCDDAY);
-               mon  = readb(&rtc->BCDMON);
-               year = readb(&rtc->BCDYEAR);
-       } while (sec != readb(&rtc->BCDSEC));
+               sec  = readb(&rtc->bcdsec);
+               min  = readb(&rtc->bcdmin);
+               hour = readb(&rtc->bcdhour);
+               mday = readb(&rtc->bcddate);
+               wday = readb(&rtc->bcdday);
+               mon  = readb(&rtc->bcdmon);
+               year = readb(&rtc->bcdyear);
+       } while (sec != readb(&rtc->bcdsec));
 
        /* read ALARM registers */
-       a_sec   = readb(&rtc->ALMSEC);
-       a_min   = readb(&rtc->ALMMIN);
-       a_hour  = readb(&rtc->ALMHOUR);
-       a_date  = readb(&rtc->ALMDATE);
-       a_mon   = readb(&rtc->ALMMON);
-       a_year  = readb(&rtc->ALMYEAR);
-       a_armed = readb(&rtc->RTCALM);
+       a_sec   = readb(&rtc->almsec);
+       a_min   = readb(&rtc->almmin);
+       a_hour  = readb(&rtc->almhour);
+       a_date  = readb(&rtc->almdate);
+       a_mon   = readb(&rtc->almmon);
+       a_year  = readb(&rtc->almyear);
+       a_armed = readb(&rtc->rtcalm);
 
        /* disable access to RTC registers */
        SetRTC_Access(RTC_DISABLE);
@@ -145,13 +129,13 @@ int rtc_set(struct rtc_time *tmp)
        SetRTC_Access(RTC_ENABLE);
 
        /* write RTC registers */
-       writeb(sec, &rtc->BCDSEC);
-       writeb(min, &rtc->BCDMIN);
-       writeb(hour, &rtc->BCDHOUR);
-       writeb(mday, &rtc->BCDDATE);
-       writeb(wday, &rtc->BCDDAY);
-       writeb(mon, &rtc->BCDMON);
-       writeb(year, &rtc->BCDYEAR);
+       writeb(sec, &rtc->bcdsec);
+       writeb(min, &rtc->bcdmin);
+       writeb(hour, &rtc->bcdhour);
+       writeb(mday, &rtc->bcddate);
+       writeb(wday, &rtc->bcdday);
+       writeb(mon, &rtc->bcdmon);
+       writeb(year, &rtc->bcdyear);
 
        /* disable access to RTC registers */
        SetRTC_Access(RTC_DISABLE);
@@ -163,8 +147,8 @@ void rtc_reset(void)
 {
        struct s3c24x0_rtc *rtc = s3c24x0_get_base_rtc();
 
-       writeb((readb(&rtc->RTCCON) & ~0x06) | 0x08, &rtc->RTCCON);
-       writeb(readb(&rtc->RTCCON) & ~(0x08 | 0x01), &rtc->RTCCON);
+       writeb((readb(&rtc->rtccon) & ~0x06) | 0x08, &rtc->rtccon);
+       writeb(readb(&rtc->rtccon) & ~(0x08 | 0x01), &rtc->rtccon);
 }
 
 #endif