diff options
Diffstat (limited to 'drivers/rtc/rtc-dm355evm.c')
-rw-r--r-- | drivers/rtc/rtc-dm355evm.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/drivers/rtc/rtc-dm355evm.c b/drivers/rtc/rtc-dm355evm.c index 97d8259b9494..cd947a20843b 100644 --- a/drivers/rtc/rtc-dm355evm.c +++ b/drivers/rtc/rtc-dm355evm.c | |||
@@ -1,12 +1,8 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0+ | ||
1 | /* | 2 | /* |
2 | * rtc-dm355evm.c - access battery-backed counter in MSP430 firmware | 3 | * rtc-dm355evm.c - access battery-backed counter in MSP430 firmware |
3 | * | 4 | * |
4 | * Copyright (c) 2008 by David Brownell | 5 | * Copyright (c) 2008 by David Brownell |
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public License | ||
8 | * as published by the Free Software Foundation; either version | ||
9 | * 2 of the License, or (at your option) any later version. | ||
10 | */ | 6 | */ |
11 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
12 | #include <linux/init.h> | 8 | #include <linux/init.h> |
@@ -78,7 +74,7 @@ static int dm355evm_rtc_read_time(struct device *dev, struct rtc_time *tm) | |||
78 | 74 | ||
79 | dev_dbg(dev, "read timestamp %08x\n", time.value); | 75 | dev_dbg(dev, "read timestamp %08x\n", time.value); |
80 | 76 | ||
81 | rtc_time_to_tm(le32_to_cpu(time.value), tm); | 77 | rtc_time64_to_tm(le32_to_cpu(time.value), tm); |
82 | return 0; | 78 | return 0; |
83 | } | 79 | } |
84 | 80 | ||
@@ -88,7 +84,7 @@ static int dm355evm_rtc_set_time(struct device *dev, struct rtc_time *tm) | |||
88 | unsigned long value; | 84 | unsigned long value; |
89 | int status; | 85 | int status; |
90 | 86 | ||
91 | rtc_tm_to_time(tm, &value); | 87 | value = rtc_tm_to_time64(tm); |
92 | time.value = cpu_to_le32(value); | 88 | time.value = cpu_to_le32(value); |
93 | 89 | ||
94 | dev_dbg(dev, "write timestamp %08x\n", time.value); | 90 | dev_dbg(dev, "write timestamp %08x\n", time.value); |
@@ -127,16 +123,16 @@ static int dm355evm_rtc_probe(struct platform_device *pdev) | |||
127 | { | 123 | { |
128 | struct rtc_device *rtc; | 124 | struct rtc_device *rtc; |
129 | 125 | ||
130 | rtc = devm_rtc_device_register(&pdev->dev, pdev->name, | 126 | rtc = devm_rtc_allocate_device(&pdev->dev); |
131 | &dm355evm_rtc_ops, THIS_MODULE); | 127 | if (IS_ERR(rtc)) |
132 | if (IS_ERR(rtc)) { | ||
133 | dev_err(&pdev->dev, "can't register RTC device, err %ld\n", | ||
134 | PTR_ERR(rtc)); | ||
135 | return PTR_ERR(rtc); | 128 | return PTR_ERR(rtc); |
136 | } | 129 | |
137 | platform_set_drvdata(pdev, rtc); | 130 | platform_set_drvdata(pdev, rtc); |
138 | 131 | ||
139 | return 0; | 132 | rtc->ops = &dm355evm_rtc_ops; |
133 | rtc->range_max = U32_MAX; | ||
134 | |||
135 | return rtc_register_device(rtc); | ||
140 | } | 136 | } |
141 | 137 | ||
142 | /* | 138 | /* |