rtc: tegra: set range
Subsystems (2)
Alexandre Belloni
maintainerPATCH 1/3 rtc: tegra: set range
The Tegra 20 RTC is a 32bit seconds counter (with an unused millisecond counter).
--- drivers/rtc/rtc-tegra.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
drivers/rtc/rtc-tegra.c +14 -10
@@ -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 ;
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 2/3 rtc: tegra: switch to rtc_time64_to_tm/rtc_tm_to_time64
Call the 64bit versions of rtc_tm time conversion now that the range is enforced by the core.
--- drivers/rtc/rtc-tegra.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/rtc/rtc-tegra.c +4 -4
@@ -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 ;
Signature · 1 line
2.20.1
Re: [PATCH 2/3] rtc: tegra: switch to rtc_time64_to_tm/rtc_tm_to_time64
Quoted 7 lines · Alexandre Belloni
Call the 64bit versions of
rtc_tmtime conversion now that the range is enforced by the core.Signed-off-by Alexandre Belloni <[email protected]>--- drivers/rtc/rtc-tegra.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Alexandre Belloni
maintainerPATCH 3/3 rtc: tegra: convert to SPDX identifier
In reply to Alexandre BelloniUse SPDX-License-Identifier instead of a verbose license text.
--- drivers/rtc/rtc-tegra.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)
drivers/rtc/rtc-tegra.c +1 -14
@@ -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>
Signature · 1 line
2.20.1
Re: [PATCH 3/3] rtc: tegra: convert to SPDX identifier
Quoted 6 lines · Alexandre Belloni
Use SPDX-License-Identifier instead of a verbose license text.
Signed-off-by Alexandre Belloni <[email protected]>--- drivers/rtc/rtc-tegra.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)
Quoted 13 lines · Alexandre Belloni
The Tegra 20 RTC is a 32bit seconds counter (with an unused millisecond counter).
Signed-off-by Alexandre Belloni <[email protected]>--- drivers/rtc/rtc-tegra.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)drivers/rtc/rtc-tegra.c +0
-0
drivers/rtc/rtc-tegra.c static int __init tegra_rtc_probe(struct platform_device *pdev) · line 314
Quoted 9 lines
drivers/rtc/rtc-tegra.c +6
-0@@ -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:
Alexandre Belloni
maintainerQuoted 17 lines · Thierry Reding
Quoted 16 lines · Alexandre Belloni
The Tegra 20 RTC is a 32bit seconds counter (with an unused millisecond counter).
Signed-off-by Alexandre Belloni <[email protected]>--- drivers/rtc/rtc-tegra.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)drivers/rtc/rtc-tegra.c +0
-0@@ -306,6 +306,13 @@ static int __init tegra_rtc_probe(struct platform_device *pdev) info->tegra_rtc_irq = ret;
Quoted 10 lines
drivers/rtc/rtc-tegra.c static int __init tegra_rtc_probe(struct platform_device *pdev) · line 314
Quoted 6 lines
drivers/rtc/rtc-tegra.c +6
-0+ 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.
Quoted 1 line
Acked-by Thierry Reding <[email protected]>
Signature · 3 lines
Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Quoted 29 lines · Alexandre Belloni
Quoted 17 lines · Thierry Reding
Quoted 16 lines · Alexandre Belloni
The Tegra 20 RTC is a 32bit seconds counter (with an unused millisecond counter).
Signed-off-by Alexandre Belloni <[email protected]>--- drivers/rtc/rtc-tegra.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)drivers/rtc/rtc-tegra.c +0
-0@@ -306,6 +306,13 @@ static int __init tegra_rtc_probe(struct platform_device *pdev) info->tegra_rtc_irq = ret;Quoted 10 lines
drivers/rtc/rtc-tegra.c static int __init tegra_rtc_probe(struct platform_device *pdev) · line 314
Quoted 6 lines
drivers/rtc/rtc-tegra.c +6
-0+ 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:
Quoted 4 lines
Well, I needed it to be before the
clk_prepare_enablecall so it can just return and I thought it would be better to leavedevm_clk_getclose to thatclk_prepare_enablecall. 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