Merge tag 'fsnotify_for_v5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / rtc / rtc-pcap.c

diff --git a/drivers/rtc/rtc-pcap.c b/drivers/rtc/rtc-pcap.c
index f176cb9..178bfb1 100644 (file)
--- a/drivers/rtc/rtc-pcap.c
+++ b/drivers/rtc/rtc-pcap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  pcap rtc code for Motorola EZX phones
  *
@@ -5,11 +6,6 @@
  *  Copyright (c) 2009 Daniel Ribeiro <drwyrm@gmail.com>
  *
  *  Based on Motorola's rtc.c Copyright (c) 2003-2005 Motorola
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
  */
 
 #include <linux/kernel.h>
@@ -55,7 +51,7 @@ static int pcap_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
        ezx_pcap_read(pcap_rtc->pcap, PCAP_REG_RTC_DAYA, &days);
        secs += (days & PCAP_RTC_DAY_MASK) * SEC_PER_DAY;
 
-       rtc_time_to_tm(secs, tm);
+       rtc_time64_to_tm(secs, tm);
 
        return 0;
 }
@@ -63,12 +59,9 @@ static int pcap_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 static int pcap_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 {
        struct pcap_rtc *pcap_rtc = dev_get_drvdata(dev);
-       struct rtc_time *tm = &alrm->time;
-       unsigned long secs;
+       unsigned long secs = rtc_tm_to_time64(&alrm->time);
        u32 tod, days;
 
-       rtc_tm_to_time(tm, &secs);
-
        tod = secs % SEC_PER_DAY;
        ezx_pcap_write(pcap_rtc->pcap, PCAP_REG_RTC_TODA, tod);
 
@@ -90,14 +83,15 @@ static int pcap_rtc_read_time(struct device *dev, struct rtc_time *tm)
        ezx_pcap_read(pcap_rtc->pcap, PCAP_REG_RTC_DAY, &days);
        secs += (days & PCAP_RTC_DAY_MASK) * SEC_PER_DAY;
 
-       rtc_time_to_tm(secs, tm);
+       rtc_time64_to_tm(secs, tm);
 
        return 0;
 }
 
-static int pcap_rtc_set_mmss(struct device *dev, unsigned long secs)
+static int pcap_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
        struct pcap_rtc *pcap_rtc = dev_get_drvdata(dev);
+       unsigned long secs = rtc_tm_to_time64(tm);
        u32 tod, days;
 
        tod = secs % SEC_PER_DAY;
@@ -128,9 +122,9 @@ static int pcap_rtc_alarm_irq_enable(struct device *dev, unsigned int en)
 
 static const struct rtc_class_ops pcap_rtc_ops = {
        .read_time = pcap_rtc_read_time,
+       .set_time = pcap_rtc_set_time,
        .read_alarm = pcap_rtc_read_alarm,
        .set_alarm = pcap_rtc_set_alarm,
-       .set_mmss = pcap_rtc_set_mmss,
        .alarm_irq_enable = pcap_rtc_alarm_irq_enable,
 };
 
@@ -149,11 +143,13 @@ static int __init pcap_rtc_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, pcap_rtc);
 
-       pcap_rtc->rtc = devm_rtc_device_register(&pdev->dev, "pcap",
-                                       &pcap_rtc_ops, THIS_MODULE);
+       pcap_rtc->rtc = devm_rtc_allocate_device(&pdev->dev);
        if (IS_ERR(pcap_rtc->rtc))
                return PTR_ERR(pcap_rtc->rtc);
 
+       pcap_rtc->rtc->ops = &pcap_rtc_ops;
+       pcap_rtc->rtc->range_max = (1 << 14) * 86400ULL - 1;
+
        timer_irq = pcap_to_irq(pcap_rtc->pcap, PCAP_IRQ_1HZ);
        alarm_irq = pcap_to_irq(pcap_rtc->pcap, PCAP_IRQ_TODA);
 
@@ -167,7 +163,7 @@ static int __init pcap_rtc_probe(struct platform_device *pdev)
        if (err)
                return err;
 
-       return 0;
+       return rtc_register_device(pcap_rtc->rtc);
 }
 
 static int __exit pcap_rtc_remove(struct platform_device *pdev)