spl: saveenv: adding saveenv support in SPL

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

diff --git a/drivers/rtc/ds1307.c b/drivers/rtc/ds1307.c
index 0650d915abb80c72ef04b2bc5372c975c377bb05..3be1da68731e34a45da24dd203d53ea3ef3e0885 100644 (file)
--- a/drivers/rtc/ds1307.c
+++ b/drivers/rtc/ds1307.c
@@ -4,28 +4,12 @@
  * Keith Outwater, keith_outwater@mvis.com`
  * Steven Scholz, steven.scholz@imc-berlin.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+
  */
 
 /*
  * Date & Time support (no alarms) for Dallas Semiconductor (now Maxim)
- * DS1307 and DS1338 Real Time Clock (RTC).
+ * DS1307 and DS1338/9 Real Time Clock (RTC).
  *
  * based on ds1337.c
  */
@@ -74,10 +58,12 @@
 #define RTC_CTL_BIT_SQWE       0x10    /* Square Wave Enable           */
 #define RTC_CTL_BIT_OUT                0x80    /* Output Control               */
 
+/* MCP7941X-specific bits */
+#define MCP7941X_BIT_ST                0x80
+#define MCP7941X_BIT_VBATEN    0x08
+
 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);
 
 /*
  * Get the current time from the RTC
@@ -87,6 +73,9 @@ int rtc_get (struct rtc_time *tmp)
        int rel = 0;
        uchar sec, min, hour, mday, wday, mon, year;
 
+#ifdef CONFIG_RTC_MCP79411
+read_rtc:
+#endif
        sec = rtc_read (RTC_SEC_REG_ADDR);
        min = rtc_read (RTC_MIN_REG_ADDR);
        hour = rtc_read (RTC_HR_REG_ADDR);
@@ -99,6 +88,7 @@ int rtc_get (struct rtc_time *tmp)
                "hr: %02x min: %02x sec: %02x\n",
                year, mon, mday, wday, hour, min, sec);
 
+#ifdef CONFIG_RTC_DS1307
        if (sec & RTC_SEC_BIT_CH) {
                printf ("### Warning: RTC oscillator has stopped\n");
                /* clear the CH flag */
@@ -106,6 +96,23 @@ int rtc_get (struct rtc_time *tmp)
                           rtc_read (RTC_SEC_REG_ADDR) & ~RTC_SEC_BIT_CH);
                rel = -1;
        }
+#endif
+
+#ifdef CONFIG_RTC_MCP79411
+       /* make sure that the backup battery is enabled */
+       if (!(wday & MCP7941X_BIT_VBATEN)) {
+               rtc_write(RTC_DAY_REG_ADDR,
+                         wday | MCP7941X_BIT_VBATEN);
+       }
+
+       /* clock halted?  turn it on, so clock can tick. */
+       if (!(sec & MCP7941X_BIT_ST)) {
+               rtc_write(RTC_SEC_REG_ADDR, MCP7941X_BIT_ST);
+               printf("Started RTC\n");
+               goto read_rtc;
+       }
+#endif
+
 
        tmp->tm_sec  = bcd2bin (sec & 0x7F);
        tmp->tm_min  = bcd2bin (min & 0x7F);
@@ -139,11 +146,20 @@ int rtc_set (struct rtc_time *tmp)
 
        rtc_write (RTC_YR_REG_ADDR, bin2bcd (tmp->tm_year % 100));
        rtc_write (RTC_MON_REG_ADDR, bin2bcd (tmp->tm_mon));
+#ifdef CONFIG_RTC_MCP79411
+       rtc_write (RTC_DAY_REG_ADDR,
+                  bin2bcd (tmp->tm_wday + 1) | MCP7941X_BIT_VBATEN);
+#else
        rtc_write (RTC_DAY_REG_ADDR, bin2bcd (tmp->tm_wday + 1));
+#endif
        rtc_write (RTC_DATE_REG_ADDR, bin2bcd (tmp->tm_mday));
        rtc_write (RTC_HR_REG_ADDR, bin2bcd (tmp->tm_hour));
        rtc_write (RTC_MIN_REG_ADDR, bin2bcd (tmp->tm_min));
+#ifdef CONFIG_RTC_MCP79411
+       rtc_write (RTC_SEC_REG_ADDR, bin2bcd (tmp->tm_sec) | MCP7941X_BIT_ST);
+#else
        rtc_write (RTC_SEC_REG_ADDR, bin2bcd (tmp->tm_sec));
+#endif
 
        return 0;
 }
@@ -195,15 +211,4 @@ static void rtc_write (uchar reg, uchar val)
 {
        i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val);
 }
-
-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