rtc: pic32: convert to devm_rtc_allocate_device
Alexandre Belloni
maintainerPATCH 1/2 rtc: pic32: convert to devm_rtc_allocate_device
This allows further improvement of the driver.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-pic32.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/rtc/rtc-pic32.c +8 -6
@@ -348,13 +348,15 @@ static int pic32_rtc_probe(struct platform_device *pdev)device_init_wakeup (&pdev->dev,1 ); - pdata->rtc =devm_rtc_device_register (&pdev->dev, pdev->name, - &pic32_rtcops, -THIS_MODULE ); -if (IS_ERR (pdata->rtc)) { - ret =PTR_ERR (pdata->rtc); + pdata->rtc =devm_rtc_allocate_device (&pdev->dev); +if (IS_ERR (pdata->rtc)) +return PTR_ERR (pdata->rtc); + + pdata->rtc->ops = &pic32_rtcops; + + ret =rtc_register_device (pdata->rtc); +if (ret) goto err_nortc; - } pdata->rtc->max_user_freq =128 ;
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 2/2 rtc: pic32: let the core handle range
Let the core handle the RTC range instead of open coding it.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-pic32.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/rtc/rtc-pic32.c +3 -7
@@ -180,22 +180,16 @@ static int pic32_rtc_settime(struct device *dev, struct rtc_time *tm) {struct pic32_rtc_dev *pdata =dev_get_drvdata (dev);void __iomem *base = pdata->reg_base; -int year = tm->tm_year -100 ;dev_dbg (dev,"set time %ptR\n" , tm); -if (year <0 || year >=100 ) { -dev_err (dev,"rtc only supports 100 years\n" ); -return -EINVAL ; - } -clk_enable (pdata->clk);writeb (bin2bcd (tm->tm_sec), base +PIC32_RTCSEC );writeb (bin2bcd (tm->tm_min), base +PIC32_RTCMIN );writeb (bin2bcd (tm->tm_hour), base +PIC32_RTCHOUR );writeb (bin2bcd (tm->tm_mday), base +PIC32_RTCDAY );writeb (bin2bcd (tm->tm_mon +1 ), base +PIC32_RTCMON ); -writeb (bin2bcd (year), base +PIC32_RTCYEAR ); +writeb (bin2bcd (tm->tm_year -100 ), base +PIC32_RTCYEAR );clk_disable (pdata->clk);return 0 ;
@@ -353,6 +347,8 @@ static int pic32_rtc_probe(struct platform_device *pdev)return PTR_ERR (pdata->rtc); pdata->rtc->ops = &pic32_rtcops; + pdata->rtc->range_min =RTC_TIMESTAMP_BEGIN_2000 ; + pdata->rtc->range_max =RTC_TIMESTAMP_END_2099 ; ret =rtc_register_device (pdata->rtc);if (ret)
Signature · 1 line
2.20.1