Skip to content

Commit acd04af

Browse files
committed
Merge tag 'rtc-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC updates from Alexandre Belloni: "Most of the changes are a rework of the cmos driver by Rafael and fixes for issues found using static checkers. The removal of a driver leads to a reduction of the number of LOC of the subsystem. Removed driver: - davinci Updates: - convert i2c drivers to .probe_new - fix spelling mistakes and duplicated words in comments - cmos: rework wake setup and ACPI event handling - cros-ec: Limit RTC alarm range to fix alarmtimer - ds1347: fix century register handling - efi: wakeup support - isl12022: temperature sensor support - pcf85063: fix read_alarm and clkout - pcf8523: use stop bit to detect invalid time - pcf8563: use RTC_FEATURE_ALARM - snvs: be more flexible on LPSRT reads - many static checker fixes" * tag 'rtc-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (48 commits) rtc: ds1742: use devm_platform_get_and_ioremap_resource() rtc: mxc_v2: Add missing clk_disable_unprepare() rtc: rs5c313: correct some spelling mistakes rtc: at91rm9200: Fix syntax errors in comments rtc: remove duplicated words in comments rtc: rv3028: Use IRQ flags obtained from device tree if available rtc: ds1307: use sysfs_emit() to instead of scnprintf() rtc: isl12026: drop obsolete dependency on COMPILE_TEST dt-bindings: rtc: m41t80: Convert text schema to YAML one rtc: pcf85063: fix pcf85063_clkout_control rtc: rx6110: fix warning with !OF rtc: rk808: reduce 'struct rk808' usage rtc: msc313: Fix function prototype mismatch in msc313_rtc_probe() dt-bindings: rtc: convert rtc-meson.txt to dt-schema rtc: pic32: Move devm_rtc_allocate_device earlier in pic32_rtc_probe() rtc: st-lpc: Add missing clk_disable_unprepare in st_rtc_probe() rtc: pcf85063: Fix reading alarm rtc: pcf8523: fix for stop bit rtc: efi: Add wakeup support rtc: pcf8563: clear RTC_FEATURE_ALARM if no irq ...
2 parents 9322af3 + e88f319 commit acd04af

Some content is hidden

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

49 files changed

+674
-1000
lines changed
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/rtc/amlogic,meson6-rtc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Amlogic Meson6, Meson8, Meson8b and Meson8m2 RTC
8+
9+
maintainers:
10+
- Neil Armstrong <[email protected]>
11+
- Martin Blumenstingl <[email protected]>
12+
13+
allOf:
14+
- $ref: rtc.yaml#
15+
- $ref: /schemas/nvmem/nvmem.yaml#
16+
17+
properties:
18+
compatible:
19+
enum:
20+
- amlogic,meson6-rtc
21+
- amlogic,meson8-rtc
22+
- amlogic,meson8b-rtc
23+
- amlogic,meson8m2-rtc
24+
25+
reg:
26+
maxItems: 1
27+
28+
clocks:
29+
maxItems: 1
30+
31+
interrupts:
32+
maxItems: 1
33+
34+
resets:
35+
maxItems: 1
36+
37+
vdd-supply: true
38+
39+
required:
40+
- compatible
41+
- reg
42+
43+
unevaluatedProperties: false
44+
45+
examples:
46+
- |
47+
#include <dt-bindings/interrupt-controller/irq.h>
48+
#include <dt-bindings/interrupt-controller/arm-gic.h>
49+
rtc: rtc@740 {
50+
compatible = "amlogic,meson6-rtc";
51+
reg = <0x740 0x14>;
52+
interrupts = <GIC_SPI 72 IRQ_TYPE_EDGE_RISING>;
53+
clocks = <&rtc32k_xtal>;
54+
vdd-supply = <&rtc_vdd>;
55+
resets = <&reset_rtc>;
56+
#address-cells = <1>;
57+
#size-cells = <1>;
58+
59+
mac@0 {
60+
reg = <0 6>;
61+
};
62+
};

Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt

Lines changed: 0 additions & 30 deletions
This file was deleted.
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/rtc/haoyu,hym8563.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Haoyu Microelectronics HYM8563 RTC
8+
9+
maintainers:
10+
- Alexandre Belloni <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: haoyu,hym8563
15+
16+
reg:
17+
maxItems: 1
18+
19+
interrupts:
20+
maxItems: 1
21+
22+
"#clock-cells":
23+
const: 0
24+
25+
clock-output-names:
26+
description: From common clock binding to override the default output clock name.
27+
maxItems: 1
28+
29+
wakeup-source:
30+
description: Enables wake up of host system on alarm.
31+
32+
allOf:
33+
- $ref: rtc.yaml
34+
35+
unevaluatedProperties: false
36+
37+
required:
38+
- compatible
39+
- reg
40+
- "#clock-cells"
41+
42+
examples:
43+
- |
44+
#include <dt-bindings/interrupt-controller/irq.h>
45+
46+
i2c {
47+
#address-cells = <1>;
48+
#size-cells = <0>;
49+
50+
rtc@51 {
51+
compatible = "haoyu,hym8563";
52+
reg = <0x51>;
53+
interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
54+
#clock-cells = <0>;
55+
};
56+
};

Documentation/devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,16 @@ maintainers:
1111

1212
properties:
1313
compatible:
14-
enum:
15-
- qcom,pm8058-rtc
16-
- qcom,pm8921-rtc
17-
- qcom,pm8941-rtc
18-
- qcom,pm8018-rtc
19-
- qcom,pmk8350-rtc
14+
oneOf:
15+
- enum:
16+
- qcom,pm8058-rtc
17+
- qcom,pm8921-rtc
18+
- qcom,pm8941-rtc
19+
- qcom,pmk8350-rtc
20+
- items:
21+
- enum:
22+
- qcom,pm8018-rtc
23+
- const: qcom,pm8921-rtc
2024

2125
reg:
2226
minItems: 1

Documentation/devicetree/bindings/rtc/rtc-m41t80.txt

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

Documentation/devicetree/bindings/rtc/rtc-meson.txt

Lines changed: 0 additions & 35 deletions
This file was deleted.
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
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,m41t80.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: ST M41T80 family of RTC and compatible
8+
9+
maintainers:
10+
- Alexandre Belloni <[email protected]>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- st,m41t62
16+
- st,m41t65
17+
- st,m41t80
18+
- st,m41t81
19+
- st,m41t81s
20+
- st,m41t82
21+
- st,m41t83
22+
- st,m41t84
23+
- st,m41t85
24+
- st,m41t87
25+
- microcrystal,rv4162
26+
27+
reg:
28+
maxItems: 1
29+
30+
interrupts:
31+
maxItems: 1
32+
33+
"#clock-cells":
34+
const: 1
35+
36+
clock-output-names:
37+
maxItems: 1
38+
description: From common clock binding to override the default output clock name.
39+
40+
clock:
41+
type: object
42+
$ref: /schemas/clock/fixed-clock.yaml#
43+
properties:
44+
clock-frequency:
45+
const: 32768
46+
47+
allOf:
48+
- $ref: rtc.yaml
49+
50+
unevaluatedProperties: false
51+
52+
required:
53+
- compatible
54+
- reg
55+
56+
examples:
57+
- |
58+
i2c {
59+
#address-cells = <1>;
60+
#size-cells = <0>;
61+
rtc@68 {
62+
compatible = "st,m41t80";
63+
reg = <0x68>;
64+
interrupt-parent = <&UIC0>;
65+
interrupts = <0x9 0x8>;
66+
67+
clock {
68+
compatible = "fixed-clock";
69+
#clock-cells = <0>;
70+
clock-frequency = <32768>;
71+
};
72+
};
73+
};

drivers/rtc/Kconfig

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ config RTC_DRV_ISL12022
433433

434434
config RTC_DRV_ISL12026
435435
tristate "Intersil ISL12026"
436-
depends on OF || COMPILE_TEST
436+
depends on OF
437437
help
438438
If you say yes here you get support for the
439439
Intersil ISL12026 RTC chip.
@@ -1351,16 +1351,6 @@ config RTC_DRV_ASM9260
13511351
This driver can also be built as a module. If so, the module
13521352
will be called rtc-asm9260.
13531353

1354-
config RTC_DRV_DAVINCI
1355-
tristate "TI DaVinci RTC"
1356-
depends on ARCH_DAVINCI_DM365 || COMPILE_TEST
1357-
help
1358-
If you say yes here you get support for the RTC on the
1359-
DaVinci platforms (DM365).
1360-
1361-
This driver can also be built as a module. If so, the module
1362-
will be called rtc-davinci.
1363-
13641354
config RTC_DRV_DIGICOLOR
13651355
tristate "Conexant Digicolor RTC"
13661356
depends on ARCH_DIGICOLOR || COMPILE_TEST

drivers/rtc/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ obj-$(CONFIG_RTC_DRV_CROS_EC) += rtc-cros-ec.o
4444
obj-$(CONFIG_RTC_DRV_DA9052) += rtc-da9052.o
4545
obj-$(CONFIG_RTC_DRV_DA9055) += rtc-da9055.o
4646
obj-$(CONFIG_RTC_DRV_DA9063) += rtc-da9063.o
47-
obj-$(CONFIG_RTC_DRV_DAVINCI) += rtc-davinci.o
4847
obj-$(CONFIG_RTC_DRV_DIGICOLOR) += rtc-digicolor.o
4948
obj-$(CONFIG_RTC_DRV_DM355EVM) += rtc-dm355evm.o
5049
obj-$(CONFIG_RTC_DRV_DS1216) += rtc-ds1216.o

drivers/rtc/class.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,11 +374,11 @@ struct rtc_device *devm_rtc_allocate_device(struct device *dev)
374374

375375
rtc->id = id;
376376
rtc->dev.parent = dev;
377-
err = dev_set_name(&rtc->dev, "rtc%d", id);
377+
err = devm_add_action_or_reset(dev, devm_rtc_release_device, rtc);
378378
if (err)
379379
return ERR_PTR(err);
380380

381-
err = devm_add_action_or_reset(dev, devm_rtc_release_device, rtc);
381+
err = dev_set_name(&rtc->dev, "rtc%d", id);
382382
if (err)
383383
return ERR_PTR(err);
384384

0 commit comments

Comments
 (0)