Skip to content

Commit 3faae16

Browse files
committed
Merge tag 'rtc-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC updates from Alexandre Belloni: "Subsytem: - rtc_class is now const Drivers: - ds1511: cleanup, set date and time range and alarm offset limit - max31335: fix interrupt handler - pcf8523: improve suspend support" * tag 'rtc-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (28 commits) MAINTAINER: Include linux-arm-msm for Qualcomm RTC patches dt-bindings: rtc: zynqmp: Add support for Versal/Versal NET SoCs rtc: class: make rtc_class constant dt-bindings: rtc: abx80x: Improve checks on trickle charger constraints MAINTAINERS: adjust file entry in ARM/Mediatek RTC DRIVER rtc: nct3018y: fix possible NULL dereference rtc: max31335: fix interrupt status reg rtc: mt6397: select IRQ_DOMAIN instead of depending on it dt-bindings: rtc: abx80x: convert to yaml rtc: m41t80: Use the unified property API get the wakeup-source property dt-bindings: at91rm9260-rtt: add sam9x7 compatible dt-bindings: rtc: convert MT7622 RTC to the json-schema dt-bindings: rtc: convert MT2717 RTC to the json-schema rtc: pcf8523: add suspend handlers for alarm IRQ rtc: ds1511: set alarm offset limit rtc: ds1511: set range rtc: ds1511: drop inline/noinline hints rtc: ds1511: rename pdata rtc: ds1511: implement ds1511_rtc_read_alarm properly rtc: ds1511: remove partial alarm support ...
2 parents 0045341 + f7cee09 commit 3faae16

20 files changed

+358
-327
lines changed

Documentation/devicetree/bindings/rtc/abracon,abx80x.txt

Lines changed: 0 additions & 31 deletions
This file was deleted.
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/rtc/abracon,abx80x.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Abracon ABX80X I2C ultra low power RTC/Alarm chip
8+
9+
maintainers:
10+
- linux-rtc@vger.kernel.org
11+
12+
properties:
13+
compatible:
14+
description:
15+
The wildcard 'abracon,abx80x' may be used to support a mix
16+
of different abracon rtc`s. In this case the driver
17+
must perform auto-detection from ID register.
18+
enum:
19+
- abracon,abx80x
20+
- abracon,ab0801
21+
- abracon,ab0803
22+
- abracon,ab0804
23+
- abracon,ab0805
24+
- abracon,ab1801
25+
- abracon,ab1803
26+
- abracon,ab1804
27+
- abracon,ab1805
28+
- microcrystal,rv1805
29+
30+
reg:
31+
maxItems: 1
32+
33+
interrupts:
34+
maxItems: 1
35+
36+
abracon,tc-diode:
37+
description:
38+
Trickle-charge diode type.
39+
Required to enable charging backup battery.
40+
41+
Supported are 'standard' diodes with a 0.6V drop
42+
and 'schottky' diodes with a 0.3V drop.
43+
$ref: /schemas/types.yaml#/definitions/string
44+
enum:
45+
- standard
46+
- schottky
47+
48+
abracon,tc-resistor:
49+
description:
50+
Trickle-charge resistor value in kOhm.
51+
Required to enable charging backup battery.
52+
$ref: /schemas/types.yaml#/definitions/uint32
53+
enum: [0, 3, 6, 11]
54+
55+
dependentRequired:
56+
abracon,tc-diode: ["abracon,tc-resistor"]
57+
abracon,tc-resistor: ["abracon,tc-diode"]
58+
59+
required:
60+
- compatible
61+
- reg
62+
63+
allOf:
64+
- $ref: rtc.yaml#
65+
- if:
66+
properties:
67+
compatible:
68+
not:
69+
contains:
70+
enum:
71+
- abracon,abx80x
72+
- abracon,ab0804
73+
- abracon,ab1804
74+
- abracon,ab0805
75+
- abracon,ab1805
76+
then:
77+
properties:
78+
abracon,tc-diode: false
79+
abracon,tc-resistor: false
80+
81+
unevaluatedProperties: false
82+
83+
examples:
84+
- |
85+
#include <dt-bindings/interrupt-controller/irq.h>
86+
87+
i2c {
88+
#address-cells = <1>;
89+
#size-cells = <0>;
90+
91+
rtc@69 {
92+
compatible = "abracon,abx80x";
93+
reg = <0x69>;
94+
abracon,tc-diode = "schottky";
95+
abracon,tc-resistor = <3>;
96+
interrupts = <44 IRQ_TYPE_EDGE_FALLING>;
97+
};
98+
};

Documentation/devicetree/bindings/rtc/atmel,at91sam9260-rtt.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ properties:
1919
- items:
2020
- const: atmel,at91sam9260-rtt
2121
- items:
22-
- const: microchip,sam9x60-rtt
22+
- enum:
23+
- microchip,sam9x60-rtt
24+
- microchip,sam9x7-rtt
2325
- const: atmel,at91sam9260-rtt
2426
- items:
2527
- const: microchip,sama7g5-rtt
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/rtc/mediatek,mt2712-rtc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: MediaTek MT2712 on-SoC RTC
8+
9+
allOf:
10+
- $ref: rtc.yaml#
11+
12+
maintainers:
13+
- Ran Bi <ran.bi@mediatek.com>
14+
15+
properties:
16+
compatible:
17+
const: mediatek,mt2712-rtc
18+
19+
reg:
20+
maxItems: 1
21+
22+
interrupts:
23+
maxItems: 1
24+
25+
required:
26+
- reg
27+
- interrupts
28+
29+
unevaluatedProperties: false
30+
31+
examples:
32+
- |
33+
#include <dt-bindings/interrupt-controller/arm-gic.h>
34+
35+
rtc@10011000 {
36+
compatible = "mediatek,mt2712-rtc";
37+
reg = <0x10011000 0x1000>;
38+
interrupts = <GIC_SPI 239 IRQ_TYPE_LEVEL_LOW>;
39+
};
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/rtc/mediatek,mt7622-rtc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: MediaTek MT7622 on-SoC RTC
8+
9+
allOf:
10+
- $ref: rtc.yaml#
11+
12+
maintainers:
13+
- Sean Wang <sean.wang@mediatek.com>
14+
15+
properties:
16+
compatible:
17+
items:
18+
- const: mediatek,mt7622-rtc
19+
- const: mediatek,soc-rtc
20+
21+
reg:
22+
maxItems: 1
23+
24+
interrupts:
25+
maxItems: 1
26+
27+
clocks:
28+
maxItems: 1
29+
30+
clock-names:
31+
const: rtc
32+
33+
required:
34+
- reg
35+
- interrupts
36+
- clocks
37+
- clock-names
38+
39+
unevaluatedProperties: false
40+
41+
examples:
42+
- |
43+
#include <dt-bindings/clock/mt7622-clk.h>
44+
#include <dt-bindings/interrupt-controller/arm-gic.h>
45+
46+
rtc@10212800 {
47+
compatible = "mediatek,mt7622-rtc", "mediatek,soc-rtc";
48+
reg = <0x10212800 0x200>;
49+
interrupts = <GIC_SPI 129 IRQ_TYPE_LEVEL_LOW>;
50+
clocks = <&topckgen CLK_TOP_RTC>;
51+
clock-names = "rtc";
52+
};

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

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

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

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

Documentation/devicetree/bindings/rtc/xlnx,zynqmp-rtc.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,13 @@ allOf:
1818

1919
properties:
2020
compatible:
21-
const: xlnx,zynqmp-rtc
21+
oneOf:
22+
- const: xlnx,zynqmp-rtc
23+
- items:
24+
- enum:
25+
- xlnx,versal-rtc
26+
- xlnx,versal-net-rtc
27+
- const: xlnx,zynqmp-rtc
2228

2329
reg:
2430
maxItems: 1
@@ -48,6 +54,9 @@ properties:
4854
default: 0x198233
4955
deprecated: true
5056

57+
power-domains:
58+
maxItems: 1
59+
5160
required:
5261
- compatible
5362
- reg

MAINTAINERS

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2377,8 +2377,8 @@ M: Sean Wang <sean.wang@mediatek.com>
23772377
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
23782378
L: linux-mediatek@lists.infradead.org (moderated for non-subscribers)
23792379
S: Maintained
2380-
F: Documentation/devicetree/bindings/rtc/rtc-mt2712.txt
2381-
F: Documentation/devicetree/bindings/rtc/rtc-mt7622.txt
2380+
F: Documentation/devicetree/bindings/rtc/mediatek,mt2712-rtc.yaml
2381+
F: Documentation/devicetree/bindings/rtc/mediatek,mt7622-rtc.yaml
23822382
F: drivers/rtc/rtc-mt2712.c
23832383
F: drivers/rtc/rtc-mt6397.c
23842384
F: drivers/rtc/rtc-mt7622.c
@@ -2617,6 +2617,7 @@ F: drivers/pci/controller/dwc/pcie-qcom.c
26172617
F: drivers/phy/qualcomm/
26182618
F: drivers/power/*/msm*
26192619
F: drivers/reset/reset-qcom-*
2620+
F: drivers/rtc/rtc-pm8xxx.c
26202621
F: drivers/spi/spi-geni-qcom.c
26212622
F: drivers/spi/spi-qcom-qspi.c
26222623
F: drivers/spi/spi-qup.c

drivers/rtc/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1858,7 +1858,8 @@ config RTC_DRV_MT2712
18581858

18591859
config RTC_DRV_MT6397
18601860
tristate "MediaTek PMIC based RTC"
1861-
depends on MFD_MT6397 || (COMPILE_TEST && IRQ_DOMAIN)
1861+
depends on MFD_MT6397 || COMPILE_TEST
1862+
select IRQ_DOMAIN
18621863
help
18631864
This selects the MediaTek(R) RTC driver. RTC is part of MediaTek
18641865
MT6397 PMIC. You should enable MT6397 PMIC MFD before select

0 commit comments

Comments
 (0)