[PATCH 1/3] rtc: tegra: set range

[PATCH 1/3] rtc: tegra: set range

[Alexandre Belloni]

The Tegra 20 RTC is a 32bit seconds counter (with an unused millisecond
counter).

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
 drivers/rtc/rtc-tegra.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/drivers/rtc/rtc-tegra.c b/drivers/rtc/rtc-tegra.c
index c6b0a99aa3a9..3f93a1f7abb5 100644
--- a/drivers/rtc/rtc-tegra.c
+++ b/drivers/rtc/rtc-tegra.c
@@ -306,6 +306,13 @@ static int __init tegra_rtc_probe(struct platform_device *pdev)
 
 	info->tegra_rtc_irq = ret;
 
+	info->rtc_dev = devm_rtc_allocate_device(&pdev->dev);
+	if (IS_ERR(info->rtc_dev))
+		return PTR_ERR(info->rtc_dev);
+
+	info->rtc_dev->ops = &tegra_rtc_ops;
+	info->rtc_dev->range_max = U32_MAX;
+
 	info->clk = devm_clk_get(&pdev->dev, NULL);
 	if (IS_ERR(info->clk))
 		return PTR_ERR(info->clk);
@@ -327,16 +334,6 @@ static int __init tegra_rtc_probe(struct platform_device *pdev)
 
 	device_init_wakeup(&pdev->dev, 1);
 
-	info->rtc_dev = devm_rtc_device_register(&pdev->dev,
-				dev_name(&pdev->dev), &tegra_rtc_ops,
-				THIS_MODULE);
-	if (IS_ERR(info->rtc_dev)) {
-		ret = PTR_ERR(info->rtc_dev);
-		dev_err(&pdev->dev, "Unable to register device (err=%d).\n",
-			ret);
-		goto disable_clk;
-	}
-
 	ret = devm_request_irq(&pdev->dev, info->tegra_rtc_irq,
 			tegra_rtc_irq_handler, IRQF_TRIGGER_HIGH,
 			dev_name(&pdev->dev), &pdev->dev);
@@ -347,6 +344,13 @@ static int __init tegra_rtc_probe(struct platform_device *pdev)
 		goto disable_clk;
 	}
 
+	ret = rtc_register_device(info->rtc_dev);
+	if (ret) {
+		dev_err(&pdev->dev, "Unable to register device (err=%d).\n",
+			ret);
+		goto disable_clk;
+	}
+
 	dev_notice(&pdev->dev, "Tegra internal Real Time Clock\n");
 
 	return 0;
-- 
2.20.1

[PATCH 2/3] rtc: tegra: switch to rtc_time64_to_tm/rtc_tm_to_time64

[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-tegra.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/rtc/rtc-tegra.c b/drivers/rtc/rtc-tegra.c
index 3f93a1f7abb5..e93092aa6f7d 100644
--- a/drivers/rtc/rtc-tegra.c
+++ b/drivers/rtc/rtc-tegra.c
@@ -123,7 +123,7 @@ static int tegra_rtc_read_time(struct device *dev, struct rtc_time *tm)
 
 	spin_unlock_irqrestore(&info->tegra_rtc_lock, sl_irq_flags);
 
-	rtc_time_to_tm(sec, tm);
+	rtc_time64_to_tm(sec, tm);
 
 	dev_vdbg(dev, "time read as %lu. %ptR\n", sec, tm);
 
@@ -137,7 +137,7 @@ static int tegra_rtc_set_time(struct device *dev, struct rtc_time *tm)
 	int ret;
 
 	/* convert tm to seconds. */
-	rtc_tm_to_time(tm, &sec);
+	sec = rtc_tm_to_time64(tm);
 
 	dev_vdbg(dev, "time set to %lu. %ptR\n", sec, tm);
 
@@ -166,7 +166,7 @@ static int tegra_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
 	} else {
 		/* alarm is enabled. */
 		alarm->enabled = 1;
-		rtc_time_to_tm(sec, &alarm->time);
+		rtc_time64_to_tm(sec, &alarm->time);
 	}
 
 	tmp = readl(info->rtc_base + TEGRA_RTC_REG_INTR_STATUS);
@@ -204,7 +204,7 @@ static int tegra_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
 	unsigned long sec;
 
 	if (alarm->enabled)
-		rtc_tm_to_time(&alarm->time, &sec);
+		sec = rtc_tm_to_time64(&alarm->time);
 	else
 		sec = 0;
 
-- 
2.20.1

Re: [PATCH 2/3] rtc: tegra: switch to rtc_time64_to_tm/rtc_tm_to_time64

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 389 bytes --]

On Sun, Apr 07, 2019 at 11:16:45PM +0200, Alexandre Belloni 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>
> ---
>  drivers/rtc/rtc-tegra.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

Acked-by: Thierry Reding <treding@nvidia.com>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[PATCH 3/3] rtc: tegra: convert to SPDX identifier

[Alexandre Belloni]

Use SPDX-License-Identifier instead of a verbose license text.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
 drivers/rtc/rtc-tegra.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/drivers/rtc/rtc-tegra.c b/drivers/rtc/rtc-tegra.c
index e93092aa6f7d..f0ce76865434 100644
--- a/drivers/rtc/rtc-tegra.c
+++ b/drivers/rtc/rtc-tegra.c
@@ -1,21 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * An RTC driver for the NVIDIA Tegra 200 series internal RTC.
  *
  * Copyright (c) 2010, NVIDIA Corporation.
- *
- * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 #include <linux/clk.h>
-- 
2.20.1

Re: [PATCH 3/3] rtc: tegra: convert to SPDX identifier

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 363 bytes --]

On Sun, Apr 07, 2019 at 11:16:46PM +0200, Alexandre Belloni wrote:
> Use SPDX-License-Identifier instead of a verbose license text.
> 
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> ---
>  drivers/rtc/rtc-tegra.c | 15 +--------------
>  1 file changed, 1 insertion(+), 14 deletions(-)

Acked-by: Thierry Reding <treding@nvidia.com>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 1/3] rtc: tegra: set range

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 999 bytes --]

On Sun, Apr 07, 2019 at 11:16:44PM +0200, Alexandre Belloni wrote:
> The Tegra 20 RTC is a 32bit seconds counter (with an unused millisecond
> counter).
> 
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> ---
>  drivers/rtc/rtc-tegra.c | 24 ++++++++++++++----------
>  1 file changed, 14 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/rtc/rtc-tegra.c b/drivers/rtc/rtc-tegra.c
> index c6b0a99aa3a9..3f93a1f7abb5 100644
> --- a/drivers/rtc/rtc-tegra.c
> +++ b/drivers/rtc/rtc-tegra.c
> @@ -306,6 +306,13 @@ static int __init tegra_rtc_probe(struct platform_device *pdev)
>  
>  	info->tegra_rtc_irq = ret;
>  
> +	info->rtc_dev = devm_rtc_allocate_device(&pdev->dev);
> +	if (IS_ERR(info->rtc_dev))
> +		return PTR_ERR(info->rtc_dev);
> +
> +	info->rtc_dev->ops = &tegra_rtc_ops;
> +	info->rtc_dev->range_max = U32_MAX;

The placement of this new block seems somewhat arbitrary, but either
way:

Acked-by: Thierry Reding <treding@nvidia.com>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 1/3] rtc: tegra: set range

[Alexandre Belloni]

On 08/04/2019 12:22:49+0200, Thierry Reding wrote:
> On Sun, Apr 07, 2019 at 11:16:44PM +0200, Alexandre Belloni wrote:
> > The Tegra 20 RTC is a 32bit seconds counter (with an unused millisecond
> > counter).
> > 
> > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> > ---
> >  drivers/rtc/rtc-tegra.c | 24 ++++++++++++++----------
> >  1 file changed, 14 insertions(+), 10 deletions(-)
> > 
> > diff --git a/drivers/rtc/rtc-tegra.c b/drivers/rtc/rtc-tegra.c
> > index c6b0a99aa3a9..3f93a1f7abb5 100644
> > --- a/drivers/rtc/rtc-tegra.c
> > +++ b/drivers/rtc/rtc-tegra.c
> > @@ -306,6 +306,13 @@ static int __init tegra_rtc_probe(struct platform_device *pdev)
> >  
> >  	info->tegra_rtc_irq = ret;
> >  
> > +	info->rtc_dev = devm_rtc_allocate_device(&pdev->dev);
> > +	if (IS_ERR(info->rtc_dev))
> > +		return PTR_ERR(info->rtc_dev);
> > +
> > +	info->rtc_dev->ops = &tegra_rtc_ops;
> > +	info->rtc_dev->range_max = U32_MAX;
> 
> The placement of this new block seems somewhat arbitrary, but either
> way:
> 

Well, I needed it to be before the clk_prepare_enable call so it can
just return and I thought it would be better to leave devm_clk_get close
to that clk_prepare_enable call. I don't mind, I can respin with it
placed somewhere else.

> Acked-by: Thierry Reding <treding@nvidia.com>



-- 
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [PATCH 1/3] rtc: tegra: set range

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 1662 bytes --]

On Mon, Apr 08, 2019 at 01:54:06PM +0200, Alexandre Belloni wrote:
> On 08/04/2019 12:22:49+0200, Thierry Reding wrote:
> > On Sun, Apr 07, 2019 at 11:16:44PM +0200, Alexandre Belloni wrote:
> > > The Tegra 20 RTC is a 32bit seconds counter (with an unused millisecond
> > > counter).
> > > 
> > > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> > > ---
> > >  drivers/rtc/rtc-tegra.c | 24 ++++++++++++++----------
> > >  1 file changed, 14 insertions(+), 10 deletions(-)
> > > 
> > > diff --git a/drivers/rtc/rtc-tegra.c b/drivers/rtc/rtc-tegra.c
> > > index c6b0a99aa3a9..3f93a1f7abb5 100644
> > > --- a/drivers/rtc/rtc-tegra.c
> > > +++ b/drivers/rtc/rtc-tegra.c
> > > @@ -306,6 +306,13 @@ static int __init tegra_rtc_probe(struct platform_device *pdev)
> > >  
> > >  	info->tegra_rtc_irq = ret;
> > >  
> > > +	info->rtc_dev = devm_rtc_allocate_device(&pdev->dev);
> > > +	if (IS_ERR(info->rtc_dev))
> > > +		return PTR_ERR(info->rtc_dev);
> > > +
> > > +	info->rtc_dev->ops = &tegra_rtc_ops;
> > > +	info->rtc_dev->range_max = U32_MAX;
> > 
> > The placement of this new block seems somewhat arbitrary, but either
> > way:
> > 
> 
> Well, I needed it to be before the clk_prepare_enable call so it can
> just return and I thought it would be better to leave devm_clk_get close
> to that clk_prepare_enable call. I don't mind, I can respin with it
> placed somewhere else.

Don't bother. It's really just a cosmetic change and I couldn't tell you
a much better place without moving some other pieces around either. If
somebody really cares a lot, this can be done in a separate follow-up.

Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]