diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-09 17:46:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-09 17:46:33 -0400 |
commit | 8e4ff713ce313dcabbb60e6ede1ffc193e67631f (patch) | |
tree | 8efdfe4925570ec8608d40e229ed01a5432d901e /drivers/rtc/rtc-dm355evm.c | |
parent | 45182e4e1f8ac04708ca7508c51d9103f07d81ab (diff) | |
parent | dacb6a4035a010e41abaf81c1cfe2beadfb05ec8 (diff) |
Merge tag 'rtc-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC updates from Alexandre Belloni:
"A huge series from me this cycle. I went through many drivers to set
the date and time range supported by the RTC which helps solving HW
limitation when the time comes (as early as next year for some). This
time, I focused on drivers using .set_mms and .set_mmss64, allowing me
to remove those callbacks. About a third of the patches got reviews, I
actually own the RTCs and I tested another third and the remaining one
are unlikely to cause any issues.
Other than that, a single new driver and the usual fixes here and there.
Summary:
Subsystem:
- set_mmss and set_mmss64 rtc_ops removal
- Fix timestamp value for RTC_TIMESTAMP_BEGIN_1900
- Use SPDX identifier for the core
- validate upper bound of tm->tm_year
New driver:
- Aspeed BMC SoC RTC
Drivers:
- abx80x: use rtc_add_group
- ds3232: nvram support
- pcf85063: add alarm, nvram, offset correction and microcrystal
rv8263 support
- x1205: add of_match_table
- Use set_time instead of set_mms/set_mmss64 for: ab3100, coh901331,
digicolor, ds1672, ds2404, ep93xx, imxdi, jz4740, lpc32xx, mc13xxx,
mxc, pcap, stmp3xxx, test, wm831x, xgene.
- Set RTC range for: ab3100, at91sam9, coh901331, da9063, digicolor,
dm355evm, ds1672, ds2404, ep39xx, goldfish, imxdi, jz4740, lpc32xx,
mc13xxx, mv, mxc, omap, pcap, pcf85063, pcf85363, ps3, sh,
stmp3xxx, sun4v, tegra, wm831x, xgene.
- Switch to rtc_time64_to_tm/rtc_tm_to_time64 for the driver that
properly set the RTC range.
- Use dev_get_drvdata instead of multiple indirections"
* tag 'rtc-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (177 commits)
rtc: snvs: Use __maybe_unused instead of #if CONFIG_PM_SLEEP
rtc: imxdi: remove unused variable
rtc: drop set_mms and set_mmss64
rtc: pcap: convert to SPDX identifier
rtc: pcap: use .set_time
rtc: pcap: switch to rtc_time64_to_tm/rtc_tm_to_time64
rtc: pcap: set range
rtc: digicolor: convert to SPDX identifier
rtc: digicolor: use .set_time
rtc: digicolor: set range
rtc: digicolor: fix possible race condition
rtc: jz4740: convert to SPDX identifier
rtc: jz4740: rework invalid time detection
rtc: jz4740: use dev_pm_set_wake_irq() to simplify code
rtc: jz4740: use .set_time
rtc: jz4740: remove useless check
rtc: jz4740: switch to rtc_time64_to_tm/rtc_tm_to_time64
rtc: jz4740: set range
rtc: 88pm860x: prevent use-after-free on device remove
rtc: Use dev_get_drvdata()
...
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 | /* |