rtc: lpc32xx: convert to devm_rtc_allocate_device
Subsystems (2)
Alexandre Belloni
maintainerPATCH 1/6 rtc: lpc32xx: convert to devm_rtc_allocate_device
This allows further improvement of the driver.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-lpc32xx.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/rtc/rtc-lpc32xx.c +10 -9
@@ -47,8 +47,6 @@#define LPC32XX_RTC_KEY_ONSW_LOADVAL 0xB5C13F27 -#define RTC_NAME "rtc-lpc32xx" -#define rtc_readl (dev, reg) \ __raw_readl((dev)->rtc_base + (reg))#define rtc_writel (dev, reg, val) \
@@ -201,7 +199,7 @@ static int lpc32xx_rtc_probe(struct platform_device *pdev) {struct resource *res;struct lpc32xx_rtc *rtc; -int rtcirq; +int rtcirq, err;u32 tmp; rtcirq =platform_get_irq (pdev,0 );
@@ -256,12 +254,15 @@ static int lpc32xx_rtc_probe(struct platform_device *pdev)platform_set_drvdata (pdev, rtc); - rtc->rtc =devm_rtc_device_register (&pdev->dev,RTC_NAME , - &lpc32xx_rtc_ops,THIS_MODULE ); -if (IS_ERR (rtc->rtc)) { -dev_err (&pdev->dev,"Can't get RTC\n" ); + rtc->rtc =devm_rtc_allocate_device (&pdev->dev); +if (IS_ERR (rtc->rtc))return PTR_ERR (rtc->rtc); - } + + rtc->rtc->ops = &lpc32xx_rtc_ops; + + err =rtc_register_device (rtc->rtc); +if (err) +return err;/* * IRQ is enabled after device registration in case alarm IRQ
@@ -374,7 +375,7 @@ static struct platform_driver lpc32xx_rtc_driver = { .probe = lpc32xx_rtc_probe, .remove = lpc32xx_rtc_remove, .driver = { - .name = RTC_NAME, + .name = "rtc-lpc32xx", .pm = LPC32XX_RTC_PM_OPS, .of_match_table = of_match_ptr(lpc32xx_rtc_match), },
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 2/6 rtc: lpc32xx: set range
The LPC32xx RTC is a 32bit second counter.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-lpc32xx.c | 1 + 1 file changed, 1 insertion(+)
drivers/rtc/rtc-lpc32xx.c +1 -0
@@ -259,6 +259,7 @@ static int lpc32xx_rtc_probe(struct platform_device *pdev)return PTR_ERR (rtc->rtc); rtc->rtc->ops = &lpc32xx_rtc_ops; + rtc->rtc->range_max =U32_MAX ; err =rtc_register_device (rtc->rtc);if (err)
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 3/6 rtc: lpc32xx: simplify IRQ setup
In reply to Alexandre BelloniMove the optional IRQ setup to a single location.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-lpc32xx.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/rtc/rtc-lpc32xx.c +5 -10
@@ -199,21 +199,13 @@ static int lpc32xx_rtc_probe(struct platform_device *pdev) {struct resource *res;struct lpc32xx_rtc *rtc; -int rtcirq, err; +int err;u32 tmp; - rtcirq =platform_get_irq (pdev,0 ); -if (rtcirq <0 ) { -dev_warn (&pdev->dev,"Can't get interrupt resource\n" ); - rtcirq =-1 ; - } - rtc =devm_kzalloc (&pdev->dev,sizeof (*rtc),GFP_KERNEL );if (unlikely (!rtc))return -ENOMEM ; - rtc->irq = rtcirq; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); rtc->rtc_base =devm_ioremap_resource (&pdev->dev, res);if (IS_ERR (rtc->rtc_base))
@@ -269,7 +261,10 @@ static int lpc32xx_rtc_probe(struct platform_device *pdev)* IRQ is enabled after device registration in case alarm IRQ * is pending upon suspend exit. */ -if (rtc->irq >=0 ) { + rtc->irq =platform_get_irq (pdev,0 ); +if (rtc->irq <0 ) { +dev_warn (&pdev->dev,"Can't get interrupt resource\n" ); + }else {if (devm_request_irq (&pdev->dev, rtc->irq, lpc32xx_rtc_alarm_interrupt,0 , pdev->name, rtc) <0 ) {
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 4/6 rtc: lpc32xx: switch to rtc_time64_to_tm/rtc_tm_to_time64
In reply to Alexandre BelloniCall the 64bit versions of rtc_tm time conversion now that the range is enforced by the core.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-lpc32xx.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/rtc/rtc-lpc32xx.c +3 -8
@@ -66,7 +66,7 @@ static int lpc32xx_rtc_read_time(struct device *dev, struct rtc_time *time)struct lpc32xx_rtc *rtc =dev_get_drvdata (dev); elapsed_sec =rtc_readl (rtc,LPC32XX_RTC_UCOUNT ); -rtc_time_to_tm (elapsed_sec, time); +rtc_time64_to_tm (elapsed_sec, time);return 0 ; }
@@ -95,7 +95,7 @@ static int lpc32xx_rtc_read_alarm(struct device *dev, {struct lpc32xx_rtc *rtc =dev_get_drvdata (dev); -rtc_time_to_tm (rtc_readl (rtc,LPC32XX_RTC_MATCH0 ), &wkalrm->time); +rtc_time64_to_tm (rtc_readl (rtc,LPC32XX_RTC_MATCH0 ), &wkalrm->time); wkalrm->enabled = rtc->alarm_enabled; wkalrm->pending = !!(rtc_readl (rtc,LPC32XX_RTC_INTSTAT ) &LPC32XX_RTC_INTSTAT_MATCH0 );
@@ -109,13 +109,8 @@ static int lpc32xx_rtc_set_alarm(struct device *dev,struct lpc32xx_rtc *rtc =dev_get_drvdata (dev);unsigned long alarmsecs;u32 tmp; -int ret; - ret =rtc_tm_to_time (&wkalrm->time, &alarmsecs); -if (ret <0 ) { -dev_warn (dev,"Failed to convert time: %d\n" , ret); -return ret; - } + alarmsecs =rtc_tm_to_time64 (&wkalrm->time);spin_lock_irq (&rtc->lock);
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 5/6 rtc: lpc32xx: use .set_time
In reply to Alexandre BelloniUse .set_time instead of the deprecated .set_mmss.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-lpc32xx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/rtc/rtc-lpc32xx.c +3 -2
@@ -71,9 +71,10 @@ static int lpc32xx_rtc_read_time(struct device *dev, struct rtc_time *time)return 0 ; } -static int lpc32xx_rtc_set_mmss (struct device *dev,unsigned long secs) +static int lpc32xx_rtc_set_time (struct device *dev,struct rtc_time *time) {struct lpc32xx_rtc *rtc =dev_get_drvdata (dev); +u32 secs =rtc_tm_to_time64 (time);u32 tmp;spin_lock_irq (&rtc->lock);
@@ -184,7 +185,7 @@ static irqreturn_t lpc32xx_rtc_alarm_interrupt(int irq, void *dev)static const struct rtc_class_ops lpc32xx_rtc_ops = { .read_time = lpc32xx_rtc_read_time, - .set_mmss = lpc32xx_rtc_set_mmss, + .set_time = lpc32xx_rtc_set_time, .read_alarm = lpc32xx_rtc_read_alarm, .set_alarm = lpc32xx_rtc_set_alarm, .alarm_irq_enable = lpc32xx_rtc_alarm_irq_enable,
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 6/6 rtc: lpc32xx: convert to SPDX identifier
In reply to Alexandre BelloniUse SPDX-License-Identifier instead of a verbose license text.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-lpc32xx.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/rtc/rtc-lpc32xx.c +1 -9
@@ -1,14 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2010 NXP Semiconductors -* -* 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. -* -* 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., -* 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <linux/kernel.h>
Signature · 1 line
2.20.1