Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-samsung

[J-u-boot.git] / drivers / rtc / mvrtc.c

diff --git a/drivers/rtc/mvrtc.c b/drivers/rtc/mvrtc.c
index ccc573a3b7542f39c3ea0694fad6c9fbc885ec94..f070c681b94e582e6faecda27a672dbb5b1dedeb 100644 (file)
--- a/drivers/rtc/mvrtc.c
+++ b/drivers/rtc/mvrtc.c
@@ -1,51 +1,33 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2011
  * Jason Cooper <[email protected]>
- *
- * 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
  */
 
 /*
  * Date & Time support for Marvell Integrated RTC
  */
 
-#include <common.h>
 #include <command.h>
+#include <dm.h>
 #include <rtc.h>
+#include <asm/io.h>
+#include <linux/delay.h>
 #include "mvrtc.h"
 
 /* This RTC does not support century, so we assume 20 */
 #define CENTURY 20
 
-int rtc_get(struct rtc_time *t)
+static int __mv_rtc_get(struct mvrtc_registers *regs, struct rtc_time *t)
 {
        u32 time;
        u32 date;
-       struct mvrtc_registers *mvrtc_regs;
-
-       mvrtc_regs = (struct mvrtc_registers *)KW_RTC_BASE;
 
        /* read the time register */
-       time = readl(&mvrtc_regs->time);
+       time = readl(&regs->time);
 
        /* read the date register */
-       date = readl(&mvrtc_regs->date);
+       date = readl(&regs->date);
 
        /* test for 12 hour clock (can't tell if it's am/pm) */
        if (time & MVRTC_HRFMT_MSK) {
@@ -73,13 +55,20 @@ int rtc_get(struct rtc_time *t)
        return 0;
 }
 
-int rtc_set(struct rtc_time *t)
+#ifndef CONFIG_DM_RTC
+int rtc_get(struct rtc_time *t)
+{
+       struct mvrtc_registers *regs;
+
+       regs = (struct mvrtc_registers *)KW_RTC_BASE;
+       return __mv_rtc_get(regs, t);
+}
+#endif /* !CONFIG_DM_RTC */
+
+static int __mv_rtc_set(struct mvrtc_registers *regs, const struct rtc_time *t)
 {
        u32 time = 0; /* sets hour format bit to zero, 24hr format. */
        u32 date = 0;
-       struct mvrtc_registers *mvrtc_regs;
-
-       mvrtc_regs = (struct mvrtc_registers *)KW_RTC_BASE;
 
        /* check that this code isn't 80+ years old ;-) */
        if ((t->tm_year / 100) != CENTURY)
@@ -97,28 +86,100 @@ int rtc_set(struct rtc_time *t)
        date |= (bin2bcd(t->tm_year % 100) & MVRTC_YEAR_MSK) << MVRTC_YEAR_SFT;
 
        /* write the time register */
-       writel(time, &mvrtc_regs->time);
+       writel(time, &regs->time);
 
        /* write the date register */
-       writel(date, &mvrtc_regs->date);
+       writel(date, &regs->date);
 
        return 0;
 }
 
-void rtc_reset(void)
+#ifndef CONFIG_DM_RTC
+int rtc_set(struct rtc_time *t)
+{
+       struct mvrtc_registers *regs;
+
+       regs = (struct mvrtc_registers *)KW_RTC_BASE;
+       return __mv_rtc_set(regs, t);
+}
+#endif /* !CONFIG_DM_RTC */
+
+static void __mv_rtc_reset(struct mvrtc_registers *regs)
 {
        u32 time;
        u32 sec;
-       struct mvrtc_registers *mvrtc_regs;
-
-       mvrtc_regs = (struct mvrtc_registers *)KW_RTC_BASE;
 
        /* no init routine for this RTC needed, just check that it's working */
-       time = readl(&mvrtc_regs->time);
+       time = readl(&regs->time);
        sec  = bcd2bin((time >> MVRTC_SEC_SFT) & MVRTC_SEC_MSK);
        udelay(1000000);
-       time = readl(&mvrtc_regs->time);
+       time = readl(&regs->time);
 
        if (sec == bcd2bin((time >> MVRTC_SEC_SFT) & MVRTC_SEC_MSK))
                printf("Error: RTC did not increment.\n");
 }
+
+#ifndef CONFIG_DM_RTC
+void rtc_reset(void)
+{
+       struct mvrtc_registers *regs;
+
+       regs = (struct mvrtc_registers *)KW_RTC_BASE;
+       __mv_rtc_reset(regs);
+}
+#endif /* !CONFIG_DM_RTC */
+
+#ifdef CONFIG_DM_RTC
+static int mv_rtc_get(struct udevice *dev, struct rtc_time *tm)
+{
+       struct mvrtc_pdata *pdata = dev_get_plat(dev);
+       struct mvrtc_registers *regs = (struct mvrtc_registers *)pdata->iobase;
+
+       return __mv_rtc_get(regs, tm);
+}
+
+static int mv_rtc_set(struct udevice *dev, const struct rtc_time *tm)
+{
+       struct mvrtc_pdata *pdata = dev_get_plat(dev);
+       struct mvrtc_registers *regs = (struct mvrtc_registers *)pdata->iobase;
+
+       return __mv_rtc_set(regs, tm);
+}
+
+static int mv_rtc_reset(struct udevice *dev)
+{
+       struct mvrtc_pdata *pdata = dev_get_plat(dev);
+       struct mvrtc_registers *regs = (struct mvrtc_registers *)pdata->iobase;
+
+       __mv_rtc_reset(regs);
+       return 0;
+}
+
+static const struct rtc_ops mv_rtc_ops = {
+       .get = mv_rtc_get,
+       .set = mv_rtc_set,
+       .reset = mv_rtc_reset,
+};
+
+static const struct udevice_id mv_rtc_ids[] = {
+       { .compatible = "marvell,kirkwood-rtc" },
+       { .compatible = "marvell,orion-rtc" },
+       { }
+};
+
+static int mv_rtc_of_to_plat(struct udevice *dev)
+{
+       struct mvrtc_pdata *pdata = dev_get_plat(dev);
+
+       pdata->iobase = dev_read_addr(dev);
+       return 0;
+}
+
+U_BOOT_DRIVER(rtc_mv) = {
+       .name   = "rtc-mv",
+       .id     = UCLASS_RTC,
+       .of_to_plat = mv_rtc_of_to_plat,
+       .of_match = mv_rtc_ids,
+       .ops    = &mv_rtc_ops,
+};
+#endif /* CONFIG_DM_RTC */