Merge branch 'master' of git://git.denx.de/u-boot-spi

[platform/kernel/u-boot.git] / drivers / rtc / m41t62.c

diff --git a/drivers/rtc/m41t62.c b/drivers/rtc/m41t62.c
index d53ef7d..2ee7e00 100644 (file)
--- a/drivers/rtc/m41t62.c
+++ b/drivers/rtc/m41t62.c
@@ -1,5 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
+ * (C) Copyright 2018
+ * Lukasz Majewski, DENX Software Engineering, lukma@denx.de.
+ *
  * (C) Copyright 2008
  * Stefan Roese, DENX Software Engineering, sr@denx.de.
  *
@@ -15,11 +18,10 @@
 
 #include <common.h>
 #include <command.h>
+#include <dm.h>
 #include <rtc.h>
 #include <i2c.h>
 
-#if defined(CONFIG_CMD_DATE)
-
 #define M41T62_REG_SSEC        0
 #define M41T62_REG_SEC 1
 #define M41T62_REG_MIN 2
@@ -51,12 +53,8 @@
 
 #define M41T80_ALHOUR_HT       (1 << 6)        /* HT: Halt Update Bit */
 
-int rtc_get(struct rtc_time *tm)
+static void m41t62_update_rtc_time(struct rtc_time *tm, u8 *buf)
 {
-       u8 buf[M41T62_DATETIME_REG_SIZE];
-
-       i2c_read(CONFIG_SYS_I2C_RTC_ADDR, 0, 1, buf, M41T62_DATETIME_REG_SIZE);
-
        debug("%s: raw read data - sec=%02x, min=%02x, hr=%02x, "
              "mday=%02x, mon=%02x, year=%02x, wday=%02x, y2k=%02x\n",
              __FUNCTION__,
@@ -79,20 +77,14 @@ int rtc_get(struct rtc_time *tm)
              __FUNCTION__,
              tm->tm_sec, tm->tm_min, tm->tm_hour,
              tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
-
-       return 0;
 }
 
-int rtc_set(struct rtc_time *tm)
+static void m41t62_set_rtc_buf(const struct rtc_time *tm, u8 *buf)
 {
-       u8 buf[M41T62_DATETIME_REG_SIZE];
-
        debug("Set DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
              tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_wday,
              tm->tm_hour, tm->tm_min, tm->tm_sec);
 
-       i2c_read(CONFIG_SYS_I2C_RTC_ADDR, 0, 1, buf, M41T62_DATETIME_REG_SIZE);
-
        /* Merge time-data and register flags into buf[0..7] */
        buf[M41T62_REG_SSEC] = 0;
        buf[M41T62_REG_SEC] =
@@ -109,8 +101,99 @@ int rtc_set(struct rtc_time *tm)
                bin2bcd(tm->tm_mon) | (buf[M41T62_REG_MON] & ~0x1f);
        /* assume 20YY not 19YY */
        buf[M41T62_REG_YEAR] = bin2bcd(tm->tm_year % 100);
+}
+
+#ifdef CONFIG_DM_RTC
+static int m41t62_rtc_get(struct udevice *dev, struct rtc_time *tm)
+{
+       u8 buf[M41T62_DATETIME_REG_SIZE];
+       int ret;
+
+       ret = dm_i2c_read(dev, 0, buf, sizeof(buf));
+       if (ret)
+               return ret;
+
+       m41t62_update_rtc_time(tm, buf);
+
+       return 0;
+}
+
+static int m41t62_rtc_set(struct udevice *dev, const struct rtc_time *tm)
+{
+       u8 buf[M41T62_DATETIME_REG_SIZE];
+       int ret;
+
+       ret = dm_i2c_read(dev, 0, buf, sizeof(buf));
+       if (ret)
+               return ret;
+
+       m41t62_set_rtc_buf(tm, buf);
 
-       if (i2c_write(CONFIG_SYS_I2C_RTC_ADDR, 0, 1, buf, M41T62_DATETIME_REG_SIZE)) {
+       ret = dm_i2c_write(dev, 0, buf, sizeof(buf));
+       if (ret) {
+               printf("I2C write failed in %s()\n", __func__);
+               return ret;
+       }
+
+       return 0;
+}
+
+static int m41t62_rtc_reset(struct udevice *dev)
+{
+       u8 val;
+
+       /*
+        * M41T82: Make sure HT (Halt Update) bit is cleared.
+        * This bit is 0 in M41T62 so its save to clear it always.
+        */
+
+       int ret = dm_i2c_read(dev, M41T62_REG_ALARM_HOUR, &val, sizeof(val));
+
+       val &= ~M41T80_ALHOUR_HT;
+       ret |= dm_i2c_write(dev, M41T62_REG_ALARM_HOUR, &val, sizeof(val));
+
+       return ret;
+}
+
+static const struct rtc_ops m41t62_rtc_ops = {
+       .get = m41t62_rtc_get,
+       .set = m41t62_rtc_set,
+       .reset = m41t62_rtc_reset,
+};
+
+static const struct udevice_id m41t62_rtc_ids[] = {
+       { .compatible = "st,m41t62" },
+       { .compatible = "microcrystal,rv4162" },
+       { }
+};
+
+U_BOOT_DRIVER(rtc_m41t62) = {
+       .name   = "rtc-m41t62",
+       .id     = UCLASS_RTC,
+       .of_match = m41t62_rtc_ids,
+       .ops    = &m41t62_rtc_ops,
+};
+
+#else /* NON DM RTC code - will be removed */
+int rtc_get(struct rtc_time *tm)
+{
+       u8 buf[M41T62_DATETIME_REG_SIZE];
+
+       i2c_read(CONFIG_SYS_I2C_RTC_ADDR, 0, 1, buf, M41T62_DATETIME_REG_SIZE);
+       m41t62_update_rtc_time(tm, buf);
+
+       return 0;
+}
+
+int rtc_set(struct rtc_time *tm)
+{
+       u8 buf[M41T62_DATETIME_REG_SIZE];
+
+       i2c_read(CONFIG_SYS_I2C_RTC_ADDR, 0, 1, buf, M41T62_DATETIME_REG_SIZE);
+       m41t62_set_rtc_buf(tm, buf);
+
+       if (i2c_write(CONFIG_SYS_I2C_RTC_ADDR, 0, 1, buf,
+                     M41T62_DATETIME_REG_SIZE)) {
                printf("I2C write failed in %s()\n", __func__);
                return -1;
        }
@@ -130,5 +213,4 @@ void rtc_reset(void)
        val &= ~M41T80_ALHOUR_HT;
        i2c_write(CONFIG_SYS_I2C_RTC_ADDR, M41T62_REG_ALARM_HOUR, 1, &val, 1);
 }
-
-#endif
+#endif /* CONFIG_DM_RTC */