* [PATCH 1/4] rtc: coh901331: set range
@ 2019-04-07 21:10 Alexandre Belloni
2019-04-07 21:10 ` [PATCH 2/4] rtc: coh901331: switch to rtc_time64_to_tm/rtc_tm_to_time64 Alexandre Belloni
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Alexandre Belloni @ 2019-04-07 21:10 UTC (permalink / raw)
To: linux-rtc
Cc: Linus Walleij, linux-arm-kernel, linux-kernel, Alexandre Belloni
The COH 901 331 is a 32bit seconds counter.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
drivers/rtc/rtc-coh901331.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c
index 0b232c84f674..5b214db919d0 100644
--- a/drivers/rtc/rtc-coh901331.c
+++ b/drivers/rtc/rtc-coh901331.c
@@ -188,6 +188,13 @@ static int __init coh901331_probe(struct platform_device *pdev)
return ret;
}
+ rtap->rtc = devm_rtc_allocate_device(&pdev->dev);
+ if (IS_ERR(rtap->rtc))
+ return PTR_ERR(rtap->rtc);
+
+ rtap->rtc->ops = &coh901331_ops;
+ rtap->rtc->range_max = U32_MAX;
+
/* We enable/disable the clock only to assure it works */
ret = clk_prepare_enable(rtap->clk);
if (ret) {
@@ -197,12 +204,10 @@ static int __init coh901331_probe(struct platform_device *pdev)
clk_disable(rtap->clk);
platform_set_drvdata(pdev, rtap);
- rtap->rtc = devm_rtc_device_register(&pdev->dev, "coh901331",
- &coh901331_ops, THIS_MODULE);
- if (IS_ERR(rtap->rtc)) {
- ret = PTR_ERR(rtap->rtc);
+
+ ret = rtc_register_device(rtap->rtc);
+ if (ret)
goto out_no_rtc;
- }
return 0;
--
2.20.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/4] rtc: coh901331: switch to rtc_time64_to_tm/rtc_tm_to_time64
2019-04-07 21:10 [PATCH 1/4] rtc: coh901331: set range Alexandre Belloni
@ 2019-04-07 21:10 ` Alexandre Belloni
2019-04-08 9:11 ` Linus Walleij
2019-04-07 21:10 ` [PATCH 3/4] rtc: coh901331: use .set_time Alexandre Belloni
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Alexandre Belloni @ 2019-04-07 21:10 UTC (permalink / raw)
To: linux-rtc
Cc: Linus Walleij, linux-arm-kernel, linux-kernel, Alexandre Belloni
Call the 64bit versions of rtc_tm time conversion now that the range is
enforced by the core.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
drivers/rtc/rtc-coh901331.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c
index 5b214db919d0..1fd743fefe28 100644
--- a/drivers/rtc/rtc-coh901331.c
+++ b/drivers/rtc/rtc-coh901331.c
@@ -80,13 +80,14 @@ static int coh901331_read_time(struct device *dev, struct rtc_time *tm)
clk_enable(rtap->clk);
/* Check if the time is valid */
- if (readl(rtap->virtbase + COH901331_VALID)) {
- rtc_time_to_tm(readl(rtap->virtbase + COH901331_CUR_TIME), tm);
+ if (!readl(rtap->virtbase + COH901331_VALID)) {
clk_disable(rtap->clk);
- return 0;
+ return -EINVAL;
}
+
+ rtc_time64_to_tm(readl(rtap->virtbase + COH901331_CUR_TIME), tm);
clk_disable(rtap->clk);
- return -EINVAL;
+ return 0;
}
static int coh901331_set_mmss(struct device *dev, unsigned long secs)
@@ -105,7 +106,7 @@ static int coh901331_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
struct coh901331_port *rtap = dev_get_drvdata(dev);
clk_enable(rtap->clk);
- rtc_time_to_tm(readl(rtap->virtbase + COH901331_ALARM), &alarm->time);
+ rtc_time64_to_tm(readl(rtap->virtbase + COH901331_ALARM), &alarm->time);
alarm->pending = readl(rtap->virtbase + COH901331_IRQ_EVENT) & 1U;
alarm->enabled = readl(rtap->virtbase + COH901331_IRQ_MASK) & 1U;
clk_disable(rtap->clk);
@@ -116,9 +117,8 @@ static int coh901331_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
static int coh901331_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
{
struct coh901331_port *rtap = dev_get_drvdata(dev);
- unsigned long time;
+ unsigned long time = rtc_tm_to_time64(&alarm->time);
- rtc_tm_to_time(&alarm->time, &time);
clk_enable(rtap->clk);
writel(time, rtap->virtbase + COH901331_ALARM);
writel(alarm->enabled, rtap->virtbase + COH901331_IRQ_MASK);
--
2.20.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/4] rtc: coh901331: use .set_time
2019-04-07 21:10 [PATCH 1/4] rtc: coh901331: set range Alexandre Belloni
2019-04-07 21:10 ` [PATCH 2/4] rtc: coh901331: switch to rtc_time64_to_tm/rtc_tm_to_time64 Alexandre Belloni
@ 2019-04-07 21:10 ` Alexandre Belloni
2019-04-08 9:12 ` Linus Walleij
2019-04-07 21:10 ` [PATCH 4/4] rtc: coh901331: convert to SPDX identifier Alexandre Belloni
2019-04-08 9:10 ` [PATCH 1/4] rtc: coh901331: set range Linus Walleij
3 siblings, 1 reply; 8+ messages in thread
From: Alexandre Belloni @ 2019-04-07 21:10 UTC (permalink / raw)
To: linux-rtc
Cc: Linus Walleij, linux-arm-kernel, linux-kernel, Alexandre Belloni
Use .set_time instead of the deprecated .set_mmss.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
drivers/rtc/rtc-coh901331.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c
index 1fd743fefe28..bc9544329419 100644
--- a/drivers/rtc/rtc-coh901331.c
+++ b/drivers/rtc/rtc-coh901331.c
@@ -90,12 +90,12 @@ static int coh901331_read_time(struct device *dev, struct rtc_time *tm)
return 0;
}
-static int coh901331_set_mmss(struct device *dev, unsigned long secs)
+static int coh901331_set_time(struct device *dev, struct rtc_time *tm)
{
struct coh901331_port *rtap = dev_get_drvdata(dev);
clk_enable(rtap->clk);
- writel(secs, rtap->virtbase + COH901331_SET_TIME);
+ writel(rtc_tm_to_time64(tm), rtap->virtbase + COH901331_SET_TIME);
clk_disable(rtap->clk);
return 0;
@@ -143,7 +143,7 @@ static int coh901331_alarm_irq_enable(struct device *dev, unsigned int enabled)
static const struct rtc_class_ops coh901331_ops = {
.read_time = coh901331_read_time,
- .set_mmss = coh901331_set_mmss,
+ .set_time = coh901331_set_time,
.read_alarm = coh901331_read_alarm,
.set_alarm = coh901331_set_alarm,
.alarm_irq_enable = coh901331_alarm_irq_enable,
--
2.20.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/4] rtc: coh901331: convert to SPDX identifier
2019-04-07 21:10 [PATCH 1/4] rtc: coh901331: set range Alexandre Belloni
2019-04-07 21:10 ` [PATCH 2/4] rtc: coh901331: switch to rtc_time64_to_tm/rtc_tm_to_time64 Alexandre Belloni
2019-04-07 21:10 ` [PATCH 3/4] rtc: coh901331: use .set_time Alexandre Belloni
@ 2019-04-07 21:10 ` Alexandre Belloni
2019-04-08 9:12 ` Linus Walleij
2019-04-08 9:10 ` [PATCH 1/4] rtc: coh901331: set range Linus Walleij
3 siblings, 1 reply; 8+ messages in thread
From: Alexandre Belloni @ 2019-04-07 21:10 UTC (permalink / raw)
To: linux-rtc
Cc: Linus Walleij, linux-arm-kernel, linux-kernel, Alexandre Belloni
Use SPDX-License-Identifier instead of the custom license line.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
drivers/rtc/rtc-coh901331.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c
index bc9544329419..4ac850837153 100644
--- a/drivers/rtc/rtc-coh901331.c
+++ b/drivers/rtc/rtc-coh901331.c
@@ -1,6 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2007-2009 ST-Ericsson AB
- * License terms: GNU General Public License (GPL) version 2
* Real Time Clock interface for ST-Ericsson AB COH 901 331 RTC.
* Author: Linus Walleij <linus.walleij@stericsson.com>
* Based on rtc-pl031.c by Deepak Saxena <dsaxena@plexity.net>
--
2.20.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/4] rtc: coh901331: set range
2019-04-07 21:10 [PATCH 1/4] rtc: coh901331: set range Alexandre Belloni
` (2 preceding siblings ...)
2019-04-07 21:10 ` [PATCH 4/4] rtc: coh901331: convert to SPDX identifier Alexandre Belloni
@ 2019-04-08 9:10 ` Linus Walleij
3 siblings, 0 replies; 8+ messages in thread
From: Linus Walleij @ 2019-04-08 9:10 UTC (permalink / raw)
To: Alexandre Belloni; +Cc: linux-rtc, Linux ARM, linux-kernel
On Sun, Apr 7, 2019 at 11:10 PM Alexandre Belloni
<alexandre.belloni@bootlin.com> wrote:
> The COH 901 331 is a 32bit seconds counter.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/4] rtc: coh901331: switch to rtc_time64_to_tm/rtc_tm_to_time64
2019-04-07 21:10 ` [PATCH 2/4] rtc: coh901331: switch to rtc_time64_to_tm/rtc_tm_to_time64 Alexandre Belloni
@ 2019-04-08 9:11 ` Linus Walleij
0 siblings, 0 replies; 8+ messages in thread
From: Linus Walleij @ 2019-04-08 9:11 UTC (permalink / raw)
To: Alexandre Belloni; +Cc: linux-rtc, Linux ARM, linux-kernel
On Sun, Apr 7, 2019 at 11:10 PM Alexandre Belloni
<alexandre.belloni@bootlin.com> wrote:
> Call the 64bit versions of rtc_tm time conversion now that the range is
> enforced by the core.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 3/4] rtc: coh901331: use .set_time
2019-04-07 21:10 ` [PATCH 3/4] rtc: coh901331: use .set_time Alexandre Belloni
@ 2019-04-08 9:12 ` Linus Walleij
0 siblings, 0 replies; 8+ messages in thread
From: Linus Walleij @ 2019-04-08 9:12 UTC (permalink / raw)
To: Alexandre Belloni; +Cc: linux-rtc, Linux ARM, linux-kernel
On Sun, Apr 7, 2019 at 11:10 PM Alexandre Belloni
<alexandre.belloni@bootlin.com> wrote:
> Use .set_time instead of the deprecated .set_mmss.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 4/4] rtc: coh901331: convert to SPDX identifier
2019-04-07 21:10 ` [PATCH 4/4] rtc: coh901331: convert to SPDX identifier Alexandre Belloni
@ 2019-04-08 9:12 ` Linus Walleij
0 siblings, 0 replies; 8+ messages in thread
From: Linus Walleij @ 2019-04-08 9:12 UTC (permalink / raw)
To: Alexandre Belloni; +Cc: linux-rtc, Linux ARM, linux-kernel
On Sun, Apr 7, 2019 at 11:10 PM Alexandre Belloni
<alexandre.belloni@bootlin.com> wrote:
> Use SPDX-License-Identifier instead of the custom license line.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-04-08 9:12 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-07 21:10 [PATCH 1/4] rtc: coh901331: set range Alexandre Belloni
2019-04-07 21:10 ` [PATCH 2/4] rtc: coh901331: switch to rtc_time64_to_tm/rtc_tm_to_time64 Alexandre Belloni
2019-04-08 9:11 ` Linus Walleij
2019-04-07 21:10 ` [PATCH 3/4] rtc: coh901331: use .set_time Alexandre Belloni
2019-04-08 9:12 ` Linus Walleij
2019-04-07 21:10 ` [PATCH 4/4] rtc: coh901331: convert to SPDX identifier Alexandre Belloni
2019-04-08 9:12 ` Linus Walleij
2019-04-08 9:10 ` [PATCH 1/4] rtc: coh901331: set range Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).