Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox...

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

diff --git a/drivers/rtc/rtc-tegra.c b/drivers/rtc/rtc-tegra.c
index c6b0a99..f0ce768 100644 (file)
--- a/drivers/rtc/rtc-tegra.c
+++ b/drivers/rtc/rtc-tegra.c
@@ -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>
@@ -123,7 +110,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 +124,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 +153,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 +191,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;
 
@@ -306,6 +293,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 +321,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 +331,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;