Skip to content

Commit 3d076fe

Browse files
torvaldstorvalds
committed
Merge tag 'rtc-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC updates from Alexandre Belloni: "New drivers: - Microchip PolarFire - Nuvoton NCT3018Y - TI K3 RTC Subsystem: - Replace flush_scheduled_work() with flush_work() - Remove deprecated ida_simple_get()/ida_simple_remove() calls Drivers: - use simple i2c probe where possible - sun6i: add R329 support - zynqmp: add calibration support - vr41xx: remove unused driver" * tag 'rtc-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (31 commits) rtc: spear: set range max rtc: rtc-cmos: Do not check ACPI_FADT_LOW_POWER_S0 rtc: zynqmp: initialize fract_tick rtc: Add NCT3018Y real time clock driver dt-bindings: rtc: nuvoton: add NCT3018Y Real Time Clock dt-bindings: rtc: nxp,pcf85063: Convert to DT schema dt-bindings: rtc: microcrystal,rv3032: Add missing type to 'trickle-voltage-millivolt' rtc: rx8025: fix 12/24 hour mode detection on RX-8035 rtc: cros-ec: Only warn once in .remove() about notifier_chain problems rtc: vr41xx: remove driver rtc: mpfs: remove 'pending' variable from mpfs_rtc_wakeup_irq_handler() rtc: rv8803: fix missing unlock on error in rv8803_set_time() rtc: zynqmp: Add calibration set and get support rtc: zynqmp: Updated calibration value dt-bindings: rtc: zynqmp: Add clock information rtc: sun6i: add support for R329 RTC rtc: Directly use ida_alloc()/free() rtc: Introduce ti-k3-rtc dt-bindings: rtc: Add TI K3 RTC description dt-bindings: rtc: qcom-pm8xxx-rtc: Update the maintainers section ...
2 parents 4a93505 + 03c4cd6 commit 3d076fe

48 files changed

Lines changed: 2063 additions & 540 deletions

Some content is hidden

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

‎Documentation/devicetree/bindings/rtc/microcrystal,rv3032.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ properties:
3232
- 11000
3333

3434
trickle-voltage-millivolt:
35+
$ref: /schemas/types.yaml#/definitions/uint32
3536
enum:
3637
- 1750
3738
- 3000

‎Documentation/devicetree/bindings/rtc/nuvoton,nct3018y.yaml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/rtc/nuvoton,nct3018y.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NUVOTON NCT3018Y Real Time Clock
8+
9+
allOf:
10+
- $ref: "rtc.yaml#"
11+
12+
maintainers:
13+
- Medad CChien <ctcchien@nuvoton.com>
14+
- Mia Lin <mimi05633@gmail.com>
15+
16+
properties:
17+
compatible:
18+
const: nuvoton,nct3018y
19+
20+
reg:
21+
maxItems: 1
22+
23+
start-year: true
24+
25+
reset-source: true
26+
27+
required:
28+
- compatible
29+
- reg
30+
31+
additionalProperties: false
32+
33+
examples:
34+
- |
35+
i2c {
36+
#address-cells = <1>;
37+
#size-cells = <0>;
38+
39+
rtc@6f {
40+
compatible = "nuvoton,nct3018y";
41+
reg = <0x6f>;
42+
};
43+
};
44+
45+
...

‎Documentation/devicetree/bindings/rtc/nxp,pcf85063.txt‎

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

‎Documentation/devicetree/bindings/rtc/nxp,pcf85063.yaml‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/rtc/nxp,pcf85063.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NXP PCF85063 Real Time Clock
8+
9+
maintainers:
10+
- Alexander Stein <alexander.stein@ew.tq-group.com>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- microcrystal,rv8263
16+
- nxp,pcf85063
17+
- nxp,pcf85063a
18+
- nxp,pcf85063tp
19+
- nxp,pca85073a
20+
21+
reg:
22+
maxItems: 1
23+
24+
"#clock-cells":
25+
const: 0
26+
27+
clock-output-names:
28+
maxItems: 1
29+
30+
interrupts:
31+
maxItems: 1
32+
33+
quartz-load-femtofarads:
34+
description:
35+
The capacitive load of the quartz(x-tal).
36+
enum: [7000, 12500]
37+
default: 7000
38+
39+
clock:
40+
$ref: /schemas/clock/fixed-clock.yaml
41+
description:
42+
Provide this if the square wave pin is used as boot-enabled
43+
fixed clock.
44+
45+
wakeup-source: true
46+
47+
allOf:
48+
- $ref: rtc.yaml#
49+
- if:
50+
properties:
51+
compatible:
52+
contains:
53+
enum:
54+
- microcrystal,rv8263
55+
then:
56+
properties:
57+
quartz-load-femtofarads: false
58+
- if:
59+
properties:
60+
compatible:
61+
contains:
62+
enum:
63+
- nxp,pcf85063
64+
then:
65+
properties:
66+
quartz-load-femtofarads:
67+
const: 7000
68+
69+
required:
70+
- compatible
71+
- reg
72+
73+
additionalProperties: false
74+
75+
examples:
76+
- |
77+
i2c {
78+
#address-cells = <1>;
79+
#size-cells = <0>;
80+
81+
rtc@51 {
82+
compatible = "nxp,pcf85063a";
83+
reg = <0x51>;
84+
quartz-load-femtofarads = <12500>;
85+
86+
clock {
87+
compatible = "fixed-clock";
88+
#clock-cells = <0>;
89+
clock-frequency = <32768>;
90+
};
91+
};
92+
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm PM8xxx PMIC RTC device
88

99
maintainers:
10-
- Satya Priya <skakit@codeaurora.org>
10+
- Satya Priya <quic_c_skakit@quicinc.com>
1111

1212
properties:
1313
compatible:

‎Documentation/devicetree/bindings/rtc/rtc-mt6397.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ For MediaTek PMIC wrapper bus bindings, see:
1414
Required properties:
1515
- compatible: Should be one of follows
1616
"mediatek,mt6323-rtc": for MT6323 PMIC
17+
"mediatek,mt6358-rtc": for MT6358 PMIC
18+
"mediatek,mt6366-rtc", "mediatek,mt6358-rtc": for MT6366 PMIC
1719
"mediatek,mt6397-rtc": for MT6397 PMIC
1820

1921
Example:

‎Documentation/devicetree/bindings/rtc/ti,k3-rtc.yaml‎

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/ti,k3-rtc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Texas Instruments K3 Real Time Clock
8+
9+
maintainers:
10+
- Nishanth Menon <nm@ti.com>
11+
12+
description: |
13+
This RTC appears in the AM62x family of SoCs.
14+
15+
allOf:
16+
- $ref: "rtc.yaml#"
17+
18+
properties:
19+
compatible:
20+
enum:
21+
- ti,am62-rtc
22+
23+
reg:
24+
maxItems: 1
25+
26+
interrupts:
27+
maxItems: 1
28+
29+
clocks:
30+
items:
31+
- description: VBUS Interface clock
32+
- description: 32k Clock source (external or internal).
33+
34+
clock-names:
35+
items:
36+
- const: vbus
37+
- const: osc32k
38+
39+
power-domains:
40+
maxItems: 1
41+
42+
required:
43+
- compatible
44+
- reg
45+
- interrupts
46+
- clocks
47+
- clock-names
48+
49+
unevaluatedProperties: false
50+
51+
examples:
52+
- |
53+
#include <dt-bindings/interrupt-controller/arm-gic.h>
54+
rtc@2b1f0000 {
55+
compatible = "ti,am62-rtc";
56+
reg = <0x2b1f0000 0x100>;
57+
interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
58+
power-domains = <&bar 0>;
59+
clocks = <&foo 0>, <&foo 1>;
60+
clock-names = "vbus", "osc32k";
61+
wakeup-source;
62+
};

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,15 @@ properties:
2323
reg:
2424
maxItems: 1
2525

26+
clocks:
27+
maxItems: 1
28+
29+
clock-names:
30+
items:
31+
- const: rtc
32+
2633
interrupts:
27-
minItems: 2
34+
maxItems: 2
2835

2936
interrupt-names:
3037
items:
@@ -39,6 +46,7 @@ properties:
3946
minimum: 0x1
4047
maximum: 0x1FFFFF
4148
default: 0x198233
49+
deprecated: true
4250

4351
required:
4452
- compatible
@@ -61,5 +69,7 @@ examples:
6169
interrupts = <0 26 4>, <0 27 4>;
6270
interrupt-names = "alarm", "sec";
6371
calibration = <0x198233>;
72+
clock-names = "rtc";
73+
clocks = <&rtc_clk>;
6474
};
6575
};

‎MAINTAINERS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2486,11 +2486,13 @@ S: Supported
24862486
F: Documentation/devicetree/bindings/*/*/*npcm*
24872487
F: Documentation/devicetree/bindings/*/*npcm*
24882488
F: Documentation/devicetree/bindings/arm/npcm/*
2489+
F: Documentation/devicetree/bindings/rtc/nuvoton,nct3018y.yaml
24892490
F: arch/arm/boot/dts/nuvoton-npcm*
24902491
F: arch/arm/mach-npcm/
24912492
F: arch/arm64/boot/dts/nuvoton/
24922493
F: drivers/*/*npcm*
24932494
F: drivers/*/*/*npcm*
2495+
F: drivers/rtc/rtc-nct3018y.c
24942496
F: include/dt-bindings/clock/nuvoton,npcm7xx-clock.h
24952497
F: include/dt-bindings/clock/nuvoton,npcm845-clk.h
24962498

@@ -17529,6 +17531,7 @@ F: drivers/char/hw_random/mpfs-rng.c
1752917531
F: drivers/clk/microchip/clk-mpfs.c
1753017532
F: drivers/mailbox/mailbox-mpfs.c
1753117533
F: drivers/pci/controller/pcie-microchip-host.c
17534+
F: drivers/rtc/rtc-mpfs.c
1753217535
F: drivers/soc/microchip/
1753317536
F: drivers/spi/spi-microchip-core.c
1753417537
F: drivers/usb/musb/mpfs.c

‎drivers/rtc/Kconfig‎

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,16 @@ config RTC_DRV_MAX77686
383383
This driver can also be built as a module. If so, the module
384384
will be called rtc-max77686.
385385

386+
config RTC_DRV_NCT3018Y
387+
tristate "Nuvoton NCT3018Y"
388+
depends on OF
389+
help
390+
If you say yes here you get support for the Nuvoton NCT3018Y I2C RTC
391+
chip.
392+
393+
This driver can also be built as a module, if so, the module will be
394+
called "rtc-nct3018y".
395+
386396
config RTC_DRV_RK808
387397
tristate "Rockchip RK805/RK808/RK809/RK817/RK818 RTC"
388398
depends on MFD_RK808
@@ -1478,16 +1488,6 @@ config RTC_DRV_SUNPLUS
14781488
This driver can also be built as a module. If so, the module
14791489
will be called rtc-sunplus.
14801490

1481-
config RTC_DRV_VR41XX
1482-
tristate "NEC VR41XX"
1483-
depends on CPU_VR41XX || COMPILE_TEST
1484-
help
1485-
If you say Y here you will get access to the real time clock
1486-
built into your NEC VR41XX CPU.
1487-
1488-
To compile this driver as a module, choose M here: the
1489-
module will be called rtc-vr41xx.
1490-
14911491
config RTC_DRV_PL030
14921492
tristate "ARM AMBA PL030 RTC"
14931493
depends on ARM_AMBA
@@ -1929,6 +1929,17 @@ config RTC_DRV_ASPEED
19291929
This driver can also be built as a module, if so, the module
19301930
will be called "rtc-aspeed".
19311931

1932+
config RTC_DRV_TI_K3
1933+
tristate "TI K3 RTC"
1934+
depends on ARCH_K3 || COMPILE_TEST
1935+
select REGMAP_MMIO
1936+
help
1937+
If you say yes here you get support for the Texas Instruments's
1938+
Real Time Clock for K3 architecture.
1939+
1940+
This driver can also be built as a module, if so, the module
1941+
will be called "rtc-ti-k3".
1942+
19321943
comment "HID Sensor RTC drivers"
19331944

19341945
config RTC_DRV_HID_SENSOR_TIME
@@ -1973,4 +1984,14 @@ config RTC_DRV_MSC313
19731984
This driver can also be built as a module, if so, the module
19741985
will be called "rtc-msc313".
19751986

1987+
config RTC_DRV_POLARFIRE_SOC
1988+
tristate "Microchip PolarFire SoC built-in RTC"
1989+
depends on SOC_MICROCHIP_POLARFIRE
1990+
help
1991+
If you say yes here you will get support for the
1992+
built-in RTC on Polarfire SoC.
1993+
1994+
This driver can also be built as a module, if so, the module
1995+
will be called "rtc-mpfs".
1996+
19761997
endif # RTC_CLASS

0 commit comments

Comments
 (0)