rtc: sirfsoc: convert to devm_rtc_allocate_device
Alexandre Belloni
maintainerPATCH 1/3 rtc: sirfsoc: convert to devm_rtc_allocate_device
This allows further improvement of the driver. Also remove the unnecessary error string as the core will already display error messages.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-sirfsoc.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-)
drivers/rtc/rtc-sirfsoc.c +8 -15
@@ -341,28 +341,21 @@ static int sirfsoc_rtc_probe(struct platform_device *pdev) rtcdrv->overflow_rtc =sirfsoc_rtc_readl (rtcdrv,RTC_SW_VALUE ); - rtcdrv->rtc =devm_rtc_device_register (&pdev->dev, pdev->name, - &sirfsoc_rtc_ops,THIS_MODULE ); -if (IS_ERR (rtcdrv->rtc)) { - err =PTR_ERR (rtcdrv->rtc); -dev_err (&pdev->dev,"can't register RTC device\n" ); -return err; - } + rtcdrv->rtc =devm_rtc_allocate_device (&pdev->dev); +if (IS_ERR (rtcdrv->rtc)) +return PTR_ERR (rtcdrv->rtc); + + rtcdrv->rtc->ops = &sirfsoc_rtc_ops; rtcdrv->irq =platform_get_irq (pdev,0 ); - err =devm_request_irq ( - &pdev->dev, - rtcdrv->irq, - sirfsoc_rtc_irq_handler, -IRQF_SHARED , - pdev->name, - rtcdrv); + err =devm_request_irq (&pdev->dev, rtcdrv->irq, sirfsoc_rtc_irq_handler, +IRQF_SHARED , pdev->name, rtcdrv);if (err) {dev_err (&pdev->dev,"Unable to register for the SiRF SOC RTC IRQ\n" );return err; } -return 0 ; +return rtc_register_device (rtcdrv->rtc); }#ifdef CONFIG_PM_SLEEP
Signature · 1 line
2.24.1
Alexandre Belloni
maintainerPATCH 2/3 rtc: sirfsoc: set range
This RTC is a 32bit counter running at 16Hz. This overflows every eight years and a half. However, the driver uses the SW_VALUE register to store the overflow, extending the counter to 64bit as long as the update happens before the overflow.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-sirfsoc.c | 1 + 1 file changed, 1 insertion(+)
drivers/rtc/rtc-sirfsoc.c +1 -0
@@ -346,6 +346,7 @@ static int sirfsoc_rtc_probe(struct platform_device *pdev)return PTR_ERR (rtcdrv->rtc); rtcdrv->rtc->ops = &sirfsoc_rtc_ops; + rtcdrv->rtc->range_max = (1ULL <<60 ) -1 ; rtcdrv->irq =platform_get_irq (pdev,0 ); err = devm_request_irq(&pdev->dev, rtcdrv->irq, sirfsoc_rtc_irq_handler,
Signature · 1 line
2.24.1
Alexandre Belloni
maintainerPATCH 3/3 rtc: sirfsoc: switch to rtc_time64_to_tm/rtc_tm_to_time64
In reply to Alexandre BelloniCall the 64bit versions of rtc_tm time conversion to avoid the y2106 issue.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-sirfsoc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/rtc/rtc-sirfsoc.c +10 -10
@@ -90,13 +90,13 @@ static int sirfsoc_rtc_read_alarm(struct device *dev,*/ /* if alarm is in next overflow cycle */ if (rtc_count > rtc_alarm) -rtc_time_to_tm ((rtcdrv->overflow_rtc +1 ) - << (BITS_PER_LONG -RTC_SHIFT ) - | rtc_alarm >>RTC_SHIFT , &(alrm->time)); +rtc_time64_to_tm ((rtcdrv->overflow_rtc +1 ) + << (BITS_PER_LONG -RTC_SHIFT ) + | rtc_alarm >>RTC_SHIFT , &alrm->time);else -rtc_time_to_tm (rtcdrv->overflow_rtc - << (BITS_PER_LONG -RTC_SHIFT ) - | rtc_alarm >>RTC_SHIFT , &(alrm->time)); +rtc_time64_to_tm (rtcdrv->overflow_rtc + << (BITS_PER_LONG -RTC_SHIFT ) + | rtc_alarm >>RTC_SHIFT , &alrm->time);if (sirfsoc_rtc_readl (rtcdrv,RTC_STATUS ) &SIRFSOC_RTC_AL0E ) alrm->enabled =1 ;
@@ -113,7 +113,7 @@ static int sirfsoc_rtc_set_alarm(struct device *dev, rtcdrv =dev_get_drvdata (dev);if (alrm->enabled) { -rtc_tm_to_time (&(alrm->time), &rtc_alarm); + rtc_alarm =rtc_tm_to_time64 (&alrm->time);spin_lock_irq (&rtcdrv->lock);
@@ -181,8 +181,8 @@ static int sirfsoc_rtc_read_time(struct device *dev,cpu_relax (); }while (tmp_rtc !=sirfsoc_rtc_readl (rtcdrv,RTC_CN )); -rtc_time_to_tm (rtcdrv->overflow_rtc << (BITS_PER_LONG -RTC_SHIFT ) | - tmp_rtc >>RTC_SHIFT , tm); +rtc_time64_to_tm (rtcdrv->overflow_rtc << (BITS_PER_LONG -RTC_SHIFT ) + | tmp_rtc >>RTC_SHIFT , tm);return 0 ; }
@@ -193,7 +193,7 @@ static int sirfsoc_rtc_set_time(struct device *dev,struct sirfsoc_rtc_drv *rtcdrv; rtcdrv =dev_get_drvdata (dev); -rtc_tm_to_time (tm, &rtc_time); + rtc_time =rtc_tm_to_time64 (tm); rtcdrv->overflow_rtc = rtc_time >> (BITS_PER_LONG -RTC_SHIFT );
Signature · 1 line
2.24.1