karo: tx6: factor out PMIC initialization

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

diff --git a/drivers/rtc/m41t62.c b/drivers/rtc/m41t62.c
index cfe84f926be3e4f51170c0ae3db43093043f15d5..3829bc54eb8c0c08777e59a7d523c658fb9a8f97 100644 (file)
--- a/drivers/rtc/m41t62.c
+++ b/drivers/rtc/m41t62.c
@@ -5,20 +5,7 @@
  * based on a the Linux rtc-m41t80.c driver which is:
  *   Alexander Bigga <ab@mycable.de>, 2006 (c) mycable GmbH
  *
- * 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+
  */
 
 /*
@@ -31,7 +18,6 @@
 #include <command.h>
 #include <rtc.h>
 #include <i2c.h>
-#include <bcd.h>
 
 #if defined(CONFIG_CMD_DATE)
 
@@ -64,6 +50,8 @@
 #define M41T62_FEATURE_HT      (1 << 0)
 #define M41T62_FEATURE_BL      (1 << 1)
 
+#define M41T80_ALHOUR_HT       (1 << 6)        /* HT: Halt Update Bit */
+
 int rtc_get(struct rtc_time *tm)
 {
        u8 buf[M41T62_DATETIME_REG_SIZE];
@@ -76,16 +64,16 @@ int rtc_get(struct rtc_time *tm)
              buf[0], buf[1], buf[2], buf[3],
              buf[4], buf[5], buf[6], buf[7]);
 
-       tm->tm_sec = BCD2BIN(buf[M41T62_REG_SEC] & 0x7f);
-       tm->tm_min = BCD2BIN(buf[M41T62_REG_MIN] & 0x7f);
-       tm->tm_hour = BCD2BIN(buf[M41T62_REG_HOUR] & 0x3f);
-       tm->tm_mday = BCD2BIN(buf[M41T62_REG_DAY] & 0x3f);
+       tm->tm_sec = bcd2bin(buf[M41T62_REG_SEC] & 0x7f);
+       tm->tm_min = bcd2bin(buf[M41T62_REG_MIN] & 0x7f);
+       tm->tm_hour = bcd2bin(buf[M41T62_REG_HOUR] & 0x3f);
+       tm->tm_mday = bcd2bin(buf[M41T62_REG_DAY] & 0x3f);
        tm->tm_wday = buf[M41T62_REG_WDAY] & 0x07;
-       tm->tm_mon = BCD2BIN(buf[M41T62_REG_MON] & 0x1f);
+       tm->tm_mon = bcd2bin(buf[M41T62_REG_MON] & 0x1f);
 
        /* assume 20YY not 19YY, and ignore the Century Bit */
        /* U-Boot needs to add 1900 here */
-       tm->tm_year = BCD2BIN(buf[M41T62_REG_YEAR]) + 100 + 1900;
+       tm->tm_year = bcd2bin(buf[M41T62_REG_YEAR]) + 100 + 1900;
 
        debug("%s: tm is secs=%d, mins=%d, hours=%d, "
              "mday=%d, mon=%d, year=%d, wday=%d\n",
@@ -109,19 +97,19 @@ int rtc_set(struct rtc_time *tm)
        /* Merge time-data and register flags into buf[0..7] */
        buf[M41T62_REG_SSEC] = 0;
        buf[M41T62_REG_SEC] =
-               BIN2BCD(tm->tm_sec) | (buf[M41T62_REG_SEC] & ~0x7f);
+               bin2bcd(tm->tm_sec) | (buf[M41T62_REG_SEC] & ~0x7f);
        buf[M41T62_REG_MIN] =
-               BIN2BCD(tm->tm_min) | (buf[M41T62_REG_MIN] & ~0x7f);
+               bin2bcd(tm->tm_min) | (buf[M41T62_REG_MIN] & ~0x7f);
        buf[M41T62_REG_HOUR] =
-               BIN2BCD(tm->tm_hour) | (buf[M41T62_REG_HOUR] & ~0x3f) ;
+               bin2bcd(tm->tm_hour) | (buf[M41T62_REG_HOUR] & ~0x3f) ;
        buf[M41T62_REG_WDAY] =
                (tm->tm_wday & 0x07) | (buf[M41T62_REG_WDAY] & ~0x07);
        buf[M41T62_REG_DAY] =
-               BIN2BCD(tm->tm_mday) | (buf[M41T62_REG_DAY] & ~0x3f);
+               bin2bcd(tm->tm_mday) | (buf[M41T62_REG_DAY] & ~0x3f);
        buf[M41T62_REG_MON] =
-               BIN2BCD(tm->tm_mon) | (buf[M41T62_REG_MON] & ~0x1f);
+               bin2bcd(tm->tm_mon) | (buf[M41T62_REG_MON] & ~0x1f);
        /* assume 20YY not 19YY */
-       buf[M41T62_REG_YEAR] = BIN2BCD(tm->tm_year % 100);
+       buf[M41T62_REG_YEAR] = bin2bcd(tm->tm_year % 100);
 
        if (i2c_write(CONFIG_SYS_I2C_RTC_ADDR, 0, 1, buf, M41T62_DATETIME_REG_SIZE)) {
                printf("I2C write failed in %s()\n", __func__);
@@ -133,9 +121,15 @@ int rtc_set(struct rtc_time *tm)
 
 void rtc_reset(void)
 {
+       u8 val;
+
        /*
-        * Nothing to do
+        * M41T82: Make sure HT (Halt Update) bit is cleared.
+        * This bit is 0 in M41T62 so its save to clear it always.
         */
+       i2c_read(CONFIG_SYS_I2C_RTC_ADDR, M41T62_REG_ALARM_HOUR, 1, &val, 1);
+       val &= ~M41T80_ALHOUR_HT;
+       i2c_write(CONFIG_SYS_I2C_RTC_ADDR, M41T62_REG_ALARM_HOUR, 1, &val, 1);
 }
 
 #endif