Skip to content

Commit ff6e6de

Browse files
committed
Merge tag 'rtc-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC updates from Alexandre Belloni: "Subsystem: - Add a way for drivers to tell the core the supported alarm range is smaller than the date range. This is not used yet but will be useful for the alarmtimers in the next release. - fix Wvoid-pointer-to-enum-cast warnings - remove redundant of_match_ptr() - stop warning for invalid alarms when the alarm is disabled Drivers: - isl12022: allow setting the trip level for battery level detection - pcf2127: add support for PCF2131 and multiple timestamps - stm32: time precision improvement, many fixes - twl: NVRAM support" * tag 'rtc-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (73 commits) dt-bindings: rtc: ds3231: Remove text binding rtc: wm8350: remove unnecessary messages rtc: twl: remove unnecessary messages rtc: sun6i: remove unnecessary message rtc: stop warning for invalid alarms when the alarm is disabled rtc: twl: add NVRAM support rtc: pcf85363: Allow to wake up system without IRQ rtc: m48t86: add DT support for m48t86 dt-bindings: rtc: Add ST M48T86 rtc: pcf2127: remove useless check rtc: rzn1: Report maximum alarm limit to rtc core rtc: ds1305: Report maximum alarm limit to rtc core rtc: tps6586x: Report maximum alarm limit to rtc core rtc: cmos: Report supported alarm limit to rtc infrastructure rtc: cros-ec: Detect and report supported alarm window size rtc: Add support for limited alarm timer offsets rtc: isl1208: Fix incorrect logic in isl1208_set_xtoscb() MAINTAINERS: remove obsolete pattern in RTC SUBSYSTEM section rtc: tps65910: Remove redundant dev_warn() and do not check for 0 return after calling platform_get_irq() rtc: omap: Do not check for 0 return after calling platform_get_irq() ...
2 parents e59a698 + ce41348 commit ff6e6de

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1334
-616
lines changed

Documentation/devicetree/bindings/rtc/atmel,at91rm9200-rtc.yaml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,17 @@ maintainers:
1414

1515
properties:
1616
compatible:
17-
enum:
18-
- atmel,at91rm9200-rtc
19-
- atmel,at91sam9x5-rtc
20-
- atmel,sama5d4-rtc
21-
- atmel,sama5d2-rtc
22-
- microchip,sam9x60-rtc
23-
- microchip,sama7g5-rtc
17+
oneOf:
18+
- enum:
19+
- atmel,at91rm9200-rtc
20+
- atmel,at91sam9x5-rtc
21+
- atmel,sama5d4-rtc
22+
- atmel,sama5d2-rtc
23+
- microchip,sam9x60-rtc
24+
- microchip,sama7g5-rtc
25+
- items:
26+
- const: microchip,sam9x7-rtc
27+
- const: microchip,sam9x60-rtc
2428

2529
reg:
2630
maxItems: 1
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/rtc/intersil,isl12022.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Intersil ISL12022 Real-time Clock
8+
9+
maintainers:
10+
- Alexandre Belloni <alexandre.belloni@bootlin.com>
11+
12+
properties:
13+
compatible:
14+
const: isil,isl12022
15+
16+
reg:
17+
maxItems: 1
18+
19+
interrupts:
20+
maxItems: 1
21+
22+
'#clock-cells':
23+
const: 0
24+
25+
isil,battery-trip-levels-microvolt:
26+
description:
27+
The battery voltages at which the first alarm and second alarm
28+
should trigger (normally ~85% and ~75% of nominal V_BAT).
29+
items:
30+
- enum: [2125000, 2295000, 2550000, 2805000, 3060000, 4250000, 4675000]
31+
- enum: [1875000, 2025000, 2250000, 2475000, 2700000, 3750000, 4125000]
32+
33+
required:
34+
- compatible
35+
- reg
36+
37+
allOf:
38+
- $ref: rtc.yaml#
39+
# If #clock-cells is present, interrupts must not be present
40+
- if:
41+
required:
42+
- '#clock-cells'
43+
then:
44+
properties:
45+
interrupts: false
46+
47+
unevaluatedProperties: false
48+
49+
examples:
50+
- |
51+
#include <dt-bindings/interrupt-controller/irq.h>
52+
i2c {
53+
#address-cells = <1>;
54+
#size-cells = <0>;
55+
56+
rtc@6f {
57+
compatible = "isil,isl12022";
58+
reg = <0x6f>;
59+
interrupts-extended = <&gpio1 5 IRQ_TYPE_LEVEL_LOW>;
60+
isil,battery-trip-levels-microvolt = <2550000>, <2250000>;
61+
};
62+
};
63+
64+
...

Documentation/devicetree/bindings/rtc/maxim,ds3231.txt

Lines changed: 0 additions & 38 deletions
This file was deleted.

Documentation/devicetree/bindings/rtc/nxp,pcf2127.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
- nxp,pca2129
1919
- nxp,pcf2127
2020
- nxp,pcf2129
21+
- nxp,pcf2131
2122

2223
reg:
2324
maxItems: 1
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/rtc/st,m48t86.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: ST M48T86 / Dallas DS12887 RTC with SRAM
8+
9+
maintainers:
10+
- Alexandre Belloni <alexandre.belloni@bootlin.com>
11+
12+
allOf:
13+
- $ref: rtc.yaml
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- st,m48t86
19+
20+
reg:
21+
items:
22+
- description: index register
23+
- description: data register
24+
25+
required:
26+
- compatible
27+
- reg
28+
29+
unevaluatedProperties: false
30+
31+
examples:
32+
- |
33+
rtc@10800000 {
34+
compatible = "st,m48t86";
35+
reg = <0x10800000 0x1>, <0x11700000 0x1>;
36+
};
37+
38+
...

Documentation/devicetree/bindings/rtc/trivial-rtc.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ properties:
4545
- isil,isl1208
4646
# Intersil ISL1218 Low Power RTC with Battery Backed SRAM
4747
- isil,isl1218
48-
# Intersil ISL12022 Real-time Clock
49-
- isil,isl12022
5048
# Real Time Clock Module with I2C-Bus
5149
- microcrystal,rv3029
5250
# Real Time Clock

MAINTAINERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18084,7 +18084,6 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git
1808418084
F: Documentation/admin-guide/rtc.rst
1808518085
F: Documentation/devicetree/bindings/rtc/
1808618086
F: drivers/rtc/
18087-
F: include/linux/platform_data/rtc-*
1808818087
F: include/linux/rtc.h
1808918088
F: include/linux/rtc/
1809018089
F: include/uapi/linux/rtc.h

drivers/rtc/Kconfig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -904,9 +904,9 @@ config RTC_DRV_PCF2127
904904
select REGMAP_SPI if SPI_MASTER
905905
select WATCHDOG_CORE if WATCHDOG
906906
help
907-
If you say yes here you get support for the NXP PCF2127/29 RTC
907+
If you say yes here you get support for the NXP PCF2127/29/31 RTC
908908
chips with integrated quartz crystal for industrial applications.
909-
Both chips also have watchdog timer and tamper switch detection
909+
These chips also have watchdog timer and tamper switch detection
910910
features.
911911

912912
PCF2127 has an additional feature of 512 bytes battery backed
@@ -1196,6 +1196,7 @@ config RTC_DRV_MSM6242
11961196
config RTC_DRV_BQ4802
11971197
tristate "TI BQ4802"
11981198
depends on HAS_IOMEM && HAS_IOPORT
1199+
depends on SPARC || COMPILE_TEST
11991200
help
12001201
If you say Y here you will get support for the TI
12011202
BQ4802 RTC chip.

drivers/rtc/interface.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ int __rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
376376
err = rtc_valid_tm(&alarm->time);
377377

378378
done:
379-
if (err)
379+
if (err && alarm->enabled)
380380
dev_warn(&rtc->dev, "invalid alarm value: %ptR\n",
381381
&alarm->time);
382382

drivers/rtc/rtc-abx80x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <linux/i2c.h>
1616
#include <linux/kstrtox.h>
1717
#include <linux/module.h>
18-
#include <linux/of_device.h>
18+
#include <linux/of.h>
1919
#include <linux/rtc.h>
2020
#include <linux/watchdog.h>
2121

0 commit comments

Comments
 (0)