* [U-Boot] [PATCH 1/2] drivers/rtc: prepare mvrtc for DM conversion
@ 2018-05-28 11:39 Chris Packham
2018-05-28 11:39 ` [U-Boot] [PATCH 2/2] drivers/rtc: convert mvrtc to DM Chris Packham
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Chris Packham @ 2018-05-28 11:39 UTC (permalink / raw)
To: u-boot
Split the rtc_{get,set,reset} functions so that the bodies can be used
in a DM driver.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
drivers/rtc/mvrtc.c | 57 +++++++++++++++++++++++++++++++--------------
1 file changed, 39 insertions(+), 18 deletions(-)
diff --git a/drivers/rtc/mvrtc.c b/drivers/rtc/mvrtc.c
index f2a226650fc5..f7bf95c30292 100644
--- a/drivers/rtc/mvrtc.c
+++ b/drivers/rtc/mvrtc.c
@@ -17,19 +17,16 @@
/* 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(®s->time);
/* read the date register */
- date = readl(&mvrtc_regs->date);
+ date = readl(®s->date);
/* test for 12 hour clock (can't tell if it's am/pm) */
if (time & MVRTC_HRFMT_MSK) {
@@ -57,13 +54,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)
@@ -81,28 +85,45 @@ 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, ®s->time);
/* write the date register */
- writel(date, &mvrtc_regs->date);
+ writel(date, ®s->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(®s->time);
sec = bcd2bin((time >> MVRTC_SEC_SFT) & MVRTC_SEC_MSK);
udelay(1000000);
- time = readl(&mvrtc_regs->time);
+ time = readl(®s->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 */
--
2.17.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH 2/2] drivers/rtc: convert mvrtc to DM
2018-05-28 11:39 [U-Boot] [PATCH 1/2] drivers/rtc: prepare mvrtc for DM conversion Chris Packham
@ 2018-05-28 11:39 ` Chris Packham
2018-05-29 6:46 ` Stefan Roese
2018-06-06 11:16 ` [U-Boot] [U-Boot,2/2] " Tom Rini
2018-05-29 6:45 ` [U-Boot] [PATCH 1/2] drivers/rtc: prepare mvrtc for DM conversion Stefan Roese
2018-06-06 11:16 ` [U-Boot] [U-Boot, " Tom Rini
2 siblings, 2 replies; 6+ messages in thread
From: Chris Packham @ 2018-05-28 11:39 UTC (permalink / raw)
To: u-boot
Add DM support for the Marvell RTC driver.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
drivers/rtc/Kconfig | 7 ++++++
drivers/rtc/mvrtc.c | 56 +++++++++++++++++++++++++++++++++++++++++++++
drivers/rtc/mvrtc.h | 5 ++++
3 files changed, 68 insertions(+)
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 277dc3de737c..a3f8c8aecc74 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -48,6 +48,13 @@ config RTC_RX8010SJ
help
Support for Epson RX8010SJ Real Time Clock devices.
+config RTC_MV
+ bool "Enable Marvell RTC driver"
+ depends on DM_RTC
+ help
+ Enable Marvell RTC driver. This driver supports the rtc that is present
+ on some Marvell SoCs.
+
config RTC_S35392A
bool "Enable S35392A driver"
select BITREVERSE
diff --git a/drivers/rtc/mvrtc.c b/drivers/rtc/mvrtc.c
index f7bf95c30292..94a065379c91 100644
--- a/drivers/rtc/mvrtc.c
+++ b/drivers/rtc/mvrtc.c
@@ -10,6 +10,7 @@
#include <common.h>
#include <command.h>
+#include <dm.h>
#include <rtc.h>
#include <asm/io.h>
#include "mvrtc.h"
@@ -127,3 +128,58 @@ void rtc_reset(void)
__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_platdata(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_platdata(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_platdata(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_ofdata_to_platdata(struct udevice *dev)
+{
+ struct mvrtc_pdata *pdata = dev_get_platdata(dev);
+
+ pdata->iobase = devfdt_get_addr(dev);
+ return 0;
+}
+
+U_BOOT_DRIVER(rtc_mv) = {
+ .name = "rtc-mv",
+ .id = UCLASS_RTC,
+ .ofdata_to_platdata = mv_rtc_ofdata_to_platdata,
+ .of_match = mv_rtc_ids,
+ .ops = &mv_rtc_ops,
+};
+#endif /* CONFIG_DM_RTC */
diff --git a/drivers/rtc/mvrtc.h b/drivers/rtc/mvrtc.h
index dc470a9b73c9..87ff43299cad 100644
--- a/drivers/rtc/mvrtc.h
+++ b/drivers/rtc/mvrtc.h
@@ -20,6 +20,11 @@ struct mvrtc_registers {
u32 date;
};
+/* Platform data */
+struct mvrtc_pdata {
+ phys_addr_t iobase;
+};
+
/* time register */
#define MVRTC_SEC_SFT 0
#define MVRTC_SEC_MSK 0x7f
--
2.17.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH 2/2] drivers/rtc: convert mvrtc to DM
2018-05-28 11:39 ` [U-Boot] [PATCH 2/2] drivers/rtc: convert mvrtc to DM Chris Packham
@ 2018-05-29 6:46 ` Stefan Roese
2018-06-06 11:16 ` [U-Boot] [U-Boot,2/2] " Tom Rini
1 sibling, 0 replies; 6+ messages in thread
From: Stefan Roese @ 2018-05-29 6:46 UTC (permalink / raw)
To: u-boot
On 28.05.2018 13:39, Chris Packham wrote:
> Add DM support for the Marvell RTC driver.
>
> Signed-off-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [U-Boot,2/2] drivers/rtc: convert mvrtc to DM
2018-05-28 11:39 ` [U-Boot] [PATCH 2/2] drivers/rtc: convert mvrtc to DM Chris Packham
2018-05-29 6:46 ` Stefan Roese
@ 2018-06-06 11:16 ` Tom Rini
1 sibling, 0 replies; 6+ messages in thread
From: Tom Rini @ 2018-06-06 11:16 UTC (permalink / raw)
To: u-boot
On Mon, May 28, 2018 at 11:39:58PM +1200, Chris Packham wrote:
> Add DM support for the Marvell RTC driver.
>
> Signed-off-by: Chris Packham <judge.packham@gmail.com>
> Reviewed-by: Stefan Roese <sr@denx.de>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180606/07613b41/attachment.sig>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 1/2] drivers/rtc: prepare mvrtc for DM conversion
2018-05-28 11:39 [U-Boot] [PATCH 1/2] drivers/rtc: prepare mvrtc for DM conversion Chris Packham
2018-05-28 11:39 ` [U-Boot] [PATCH 2/2] drivers/rtc: convert mvrtc to DM Chris Packham
@ 2018-05-29 6:45 ` Stefan Roese
2018-06-06 11:16 ` [U-Boot] [U-Boot, " Tom Rini
2 siblings, 0 replies; 6+ messages in thread
From: Stefan Roese @ 2018-05-29 6:45 UTC (permalink / raw)
To: u-boot
On 28.05.2018 13:39, Chris Packham wrote:
> Split the rtc_{get,set,reset} functions so that the bodies can be used
> in a DM driver.
>
> Signed-off-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
^ permalink raw reply [flat|nested] 6+ messages in thread* [U-Boot] [U-Boot, 1/2] drivers/rtc: prepare mvrtc for DM conversion
2018-05-28 11:39 [U-Boot] [PATCH 1/2] drivers/rtc: prepare mvrtc for DM conversion Chris Packham
2018-05-28 11:39 ` [U-Boot] [PATCH 2/2] drivers/rtc: convert mvrtc to DM Chris Packham
2018-05-29 6:45 ` [U-Boot] [PATCH 1/2] drivers/rtc: prepare mvrtc for DM conversion Stefan Roese
@ 2018-06-06 11:16 ` Tom Rini
2 siblings, 0 replies; 6+ messages in thread
From: Tom Rini @ 2018-06-06 11:16 UTC (permalink / raw)
To: u-boot
On Mon, May 28, 2018 at 11:39:57PM +1200, Chris Packham wrote:
> Split the rtc_{get,set,reset} functions so that the bodies can be used
> in a DM driver.
>
> Signed-off-by: Chris Packham <judge.packham@gmail.com>
> Reviewed-by: Stefan Roese <sr@denx.de>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180606/a699ef90/attachment.sig>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-06-06 11:16 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-28 11:39 [U-Boot] [PATCH 1/2] drivers/rtc: prepare mvrtc for DM conversion Chris Packham
2018-05-28 11:39 ` [U-Boot] [PATCH 2/2] drivers/rtc: convert mvrtc to DM Chris Packham
2018-05-29 6:46 ` Stefan Roese
2018-06-06 11:16 ` [U-Boot] [U-Boot,2/2] " Tom Rini
2018-05-29 6:45 ` [U-Boot] [PATCH 1/2] drivers/rtc: prepare mvrtc for DM conversion Stefan Roese
2018-06-06 11:16 ` [U-Boot] [U-Boot, " Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox