dm: core: Update of_read_fmap_entry() for livetree

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

diff --git a/drivers/rtc/ds1374.c b/drivers/rtc/ds1374.c
index 427b1eb8d0a5f82541e99578d00e7a48c7a009c6..bc27f61c72b010f8f76e37e3413cc6713a96876e 100644 (file)
--- a/drivers/rtc/ds1374.c
+++ b/drivers/rtc/ds1374.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001, 2002, 2003
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  * Keith Outwater, keith_outwater@mvis.com`
  * Steven Scholz, steven.scholz@imc-berlin.de
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -118,7 +117,7 @@ int rtc_get (struct rtc_time *tm){
 
        DEBUGR ("Get RTC s since 1.1.1970: %ld\n", time1);
 
-       to_tm(time1, tm); /* To Gregorian Date */
+       rtc_to_tm(time1, tm); /* To Gregorian Date */
 
        if (rtc_read(RTC_SR_ADDR) & RTC_SR_BIT_OSF) {
                printf ("### Warning: RTC oscillator has stopped\n");
@@ -147,9 +146,7 @@ int rtc_set (struct rtc_time *tmp){
        if (tmp->tm_year < 1970 || tmp->tm_year > 2069)
                printf("WARNING: year should be between 1970 and 2069!\n");
 
-       time = mktime(tmp->tm_year, tmp->tm_mon,
-                       tmp->tm_mday, tmp->tm_hour,
-                       tmp->tm_min, tmp->tm_sec);
+       time = rtc_mktime(tmp);
 
        DEBUGR ("Set RTC s since 1.1.1970: %ld (0x%02lx)\n", time, time);
 
@@ -174,8 +171,6 @@ int rtc_set (struct rtc_time *tmp){
  */
 void rtc_reset (void){
 
-       struct rtc_time tmp;
-
        /* clear status flags */
        rtc_write(RTC_SR_ADDR, (RTC_SR_BIT_AF|RTC_SR_BIT_OSF), false); /* clearing OSF and AF */
 
@@ -191,19 +186,6 @@ void rtc_reset (void){
                                |RTC_CTL_BIT_BBSQW), true);/* disable WD/ALM, WDSTR set to INT-pin,
                                                              set BBSQW and SQW to 32k
                                                              - set to 1 */
-       tmp.tm_year = 1970;
-       tmp.tm_mon = 1;
-       tmp.tm_mday= 1;
-       tmp.tm_hour = 0;
-       tmp.tm_min = 0;
-       tmp.tm_sec = 0;
-
-       rtc_set(&tmp);
-
-       printf("RTC:   %4d-%02d-%02d %2d:%02d:%02d UTC\n",
-               tmp.tm_year, tmp.tm_mon, tmp.tm_mday,
-               tmp.tm_hour, tmp.tm_min, tmp.tm_sec);
-
        rtc_write(RTC_WD_ALM_CNT_BYTE2_ADDR, 0xAC, true);
        rtc_write(RTC_WD_ALM_CNT_BYTE1_ADDR, 0xDE, true);
        rtc_write(RTC_WD_ALM_CNT_BYTE2_ADDR, 0xAD, true);