Skip to content

Commit 0e287d3

Browse files
torvaldstorvalds
committed
Merge tag 'rtc-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC updates from Alexandre Belloni: "New drivers: - Amlogic A4 and A5 RTC - Marvell 88PM886 PMIC RTC - Renesas RTCA-3 for Renesas RZ/G3S Driver updates: - ab-eoz9: fix temperature and alarm support - cmos: improve locking behaviour - isl12022: add alarm support - m48t59: improve epoch handling - mt6359: add range - rzn1: fix BCD conversions and simplify driver" * tag 'rtc-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (38 commits) rtc: ab-eoz9: don't fail temperature reads on undervoltage notification rtc: rzn1: reduce register access rtc: rzn1: drop superfluous wday calculation m68k: mvme147, mvme16x: Adopt rtc-m48t59 platform driver rtc: brcmstb-waketimer: don't include 'pm_wakeup.h' directly rtc: m48t59: Use platform_data struct for year offset value rtc: ab-eoz9: fix abeoz9_rtc_read_alarm rtc: rv3028: fix RV3028_TS_COUNT type rtc: rzn1: update Michel's email rtc: rzn1: fix BCD to rtc_time conversion errors rtc: amlogic-a4: fix compile error rtc: amlogic-a4: drop error messages MAINTAINERS: Add an entry for Amlogic RTC driver rtc: support for the Amlogic on-chip RTC dt-bindings: rtc: Add Amlogic A4 and A5 RTC rtc: add driver for Marvell 88PM886 PMIC RTC rtc: check if __rtc_read_time was successful in rtc_timer_do_work() rtc: pcf8563: Switch to regmap rtc: pcf8563: Sort headers alphabetically rtc: abx80x: Fix WDT bit position of the status register ...
2 parents 831c192 + e0779a0 commit 0e287d3

Some content is hidden

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

81 files changed

+2221
-599
lines changed

‎Documentation/devicetree/bindings/rtc/allwinner,sun6i-a31-rtc.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ properties:
3030
- const: allwinner,sun50i-a64-rtc
3131
- const: allwinner,sun8i-h3-rtc
3232
- items:
33-
- const: allwinner,sun20i-d1-rtc
33+
- enum:
34+
- allwinner,sun20i-d1-rtc
35+
- allwinner,sun55i-a523-rtc
3436
- const: allwinner,sun50i-r329-rtc
3537

3638
reg:

‎Documentation/devicetree/bindings/rtc/amlogic,a4-rtc.yaml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
# Copyright (C) 2024 Amlogic, Inc. All rights reserved
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/rtc/amlogic,a4-rtc.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Amlogic A4 and A5 RTC
9+
10+
maintainers:
11+
- Yiting Deng <yiting.deng@amlogic.com>
12+
- Xianwei Zhao <xianwei.zhao@amlogic.com>
13+
14+
allOf:
15+
- $ref: rtc.yaml#
16+
17+
properties:
18+
compatible:
19+
enum:
20+
- amlogic,a4-rtc
21+
- amlogic,a5-rtc
22+
23+
reg:
24+
maxItems: 1
25+
26+
clocks:
27+
items:
28+
- description: RTC clock source, available 24M or 32K crystal
29+
oscillator source. when using 24M, need to divide 24M into 32K.
30+
- description: RTC module accesses the clock of the apb bus.
31+
32+
clock-names:
33+
items:
34+
- const: osc
35+
- const: sys
36+
37+
interrupts:
38+
maxItems: 1
39+
40+
required:
41+
- compatible
42+
- reg
43+
- clocks
44+
- clock-names
45+
- interrupts
46+
47+
additionalProperties: false
48+
49+
examples:
50+
- |
51+
#include <dt-bindings/interrupt-controller/arm-gic.h>
52+
apb {
53+
#address-cells = <2>;
54+
#size-cells = <2>;
55+
56+
rtc@8e600 {
57+
compatible = "amlogic,a4-rtc";
58+
reg = <0x0 0x8e600 0x0 0x38>;
59+
clocks = <&xtal_32k>, <&clkc_periphs 1>;
60+
clock-names = "osc", "sys";
61+
interrupts = <GIC_SPI 131 IRQ_TYPE_EDGE_RISING>;
62+
};
63+
};

‎Documentation/devicetree/bindings/rtc/microchip,mfps-rtc.yaml renamed to ‎Documentation/devicetree/bindings/rtc/microchip,mpfs-rtc.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/rtc/microchip,mfps-rtc.yaml#
4+
$id: http://devicetree.org/schemas/rtc/microchip,mpfs-rtc.yaml#
55

66
$schema: http://devicetree.org/meta-schemas/core.yaml#
77

@@ -12,12 +12,14 @@ allOf:
1212

1313
maintainers:
1414
- Daire McNamara <daire.mcnamara@microchip.com>
15-
- Lewis Hanly <lewis.hanly@microchip.com>
1615

1716
properties:
1817
compatible:
19-
enum:
20-
- microchip,mpfs-rtc
18+
oneOf:
19+
- items:
20+
- const: microchip,pic64gx-rtc
21+
- const: microchip,mpfs-rtc
22+
- const: microchip,mpfs-rtc
2123

2224
reg:
2325
maxItems: 1

‎Documentation/devicetree/bindings/rtc/renesas,rz-rtca3.yaml

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/rtc/renesas,rz-rtca3.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Renesas RTCA-3 Real Time Clock
8+
9+
maintainers:
10+
- Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
11+
12+
allOf:
13+
- $ref: rtc.yaml#
14+
15+
properties:
16+
compatible:
17+
items:
18+
- enum:
19+
- renesas,r9a08g045-rtca3 # RZ/G3S
20+
- const: renesas,rz-rtca3
21+
22+
reg:
23+
maxItems: 1
24+
25+
interrupts:
26+
items:
27+
- description: Alarm interrupt
28+
- description: Periodic interrupt
29+
- description: Carry interrupt
30+
31+
interrupt-names:
32+
items:
33+
- const: alarm
34+
- const: period
35+
- const: carry
36+
37+
clocks:
38+
items:
39+
- description: RTC bus clock
40+
- description: RTC counter clock
41+
42+
clock-names:
43+
items:
44+
- const: bus
45+
- const: counter
46+
47+
power-domains:
48+
maxItems: 1
49+
50+
resets:
51+
items:
52+
- description: VBATTB module reset
53+
54+
required:
55+
- compatible
56+
- reg
57+
- interrupts
58+
- interrupt-names
59+
- clocks
60+
- clock-names
61+
- power-domains
62+
- resets
63+
64+
additionalProperties: false
65+
66+
examples:
67+
- |
68+
#include <dt-bindings/clock/r9a08g045-cpg.h>
69+
#include <dt-bindings/clock/renesas,r9a08g045-vbattb.h>
70+
#include <dt-bindings/interrupt-controller/arm-gic.h>
71+
#include <dt-bindings/interrupt-controller/irq.h>
72+
73+
rtc@1004ec00 {
74+
compatible = "renesas,r9a08g045-rtca3", "renesas,rz-rtca3";
75+
reg = <0x1004ec00 0x400>;
76+
interrupts = <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
77+
<GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
78+
<GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>;
79+
interrupt-names = "alarm", "period", "carry";
80+
clocks = <&cpg CPG_MOD R9A08G045_VBAT_BCLK>, <&vbattclk VBATTB_VBATTCLK>;
81+
clock-names = "bus", "counter";
82+
power-domains = <&cpg>;
83+
resets = <&cpg R9A08G045_VBAT_BRESETN>;
84+
};

‎MAINTAINERS

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,6 +1218,14 @@ F: Documentation/devicetree/bindings/perf/amlogic,g12-ddr-pmu.yaml
12181218
F: drivers/perf/amlogic/
12191219
F: include/soc/amlogic/
12201220

1221+
AMLOGIC RTC DRIVER
1222+
M: Yiting Deng <yiting.deng@amlogic.com>
1223+
M: Xianwei Zhao <xianwei.zhao@amlogic.com>
1224+
L: linux-amlogic@lists.infradead.org
1225+
S: Maintained
1226+
F: Documentation/devicetree/bindings/rtc/amlogic,a4-rtc.yaml
1227+
F: drivers/rtc/rtc-amlogic-a4.c
1228+
12211229
AMPHENOL CHIPCAP 2 HUMIDITY-TEMPERATURE IIO DRIVER
12221230
M: Javier Carrasco <javier.carrasco.cruz@gmail.com>
12231231
L: linux-hwmon@vger.kernel.org
@@ -13794,6 +13802,7 @@ F: Documentation/devicetree/bindings/mfd/marvell,88pm886-a1.yaml
1379413802
F: drivers/input/misc/88pm886-onkey.c
1379513803
F: drivers/mfd/88pm886.c
1379613804
F: drivers/regulator/88pm886-regulator.c
13805+
F: drivers/rtc/rtc-88pm886.c
1379713806
F: include/linux/mfd/88pm886.h
1379813807

1379913808
MARVELL ARMADA 3700 PHY DRIVERS
@@ -19915,6 +19924,14 @@ S: Supported
1991519924
F: Documentation/devicetree/bindings/timer/renesas,rz-mtu3.yaml
1991619925
F: drivers/counter/rz-mtu3-cnt.c
1991719926

19927+
RENESAS RTCA-3 RTC DRIVER
19928+
M: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
19929+
L: linux-rtc@vger.kernel.org
19930+
L: linux-renesas-soc@vger.kernel.org
19931+
S: Supported
19932+
F: Documentation/devicetree/bindings/rtc/renesas,rz-rtca3.yaml
19933+
F: drivers/rtc/rtc-renesas-rtca3.c
19934+
1991819935
RENESAS RZ/N1 A5PSW SWITCH DRIVER
1991919936
M: Clément Léger <clement.leger@bootlin.com>
1992019937
L: linux-renesas-soc@vger.kernel.org

‎arch/m68k/configs/multi_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,7 @@ CONFIG_UHID=m
503503
# CONFIG_USB_SUPPORT is not set
504504
CONFIG_RTC_CLASS=y
505505
# CONFIG_RTC_NVMEM is not set
506+
CONFIG_RTC_DRV_M48T59=m
506507
CONFIG_RTC_DRV_MSM6242=m
507508
CONFIG_RTC_DRV_RP5C01=m
508509
CONFIG_RTC_DRV_GENERIC=m

‎arch/m68k/configs/mvme147_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,7 @@ CONFIG_UHID=m
391391
# CONFIG_USB_SUPPORT is not set
392392
CONFIG_RTC_CLASS=y
393393
# CONFIG_RTC_NVMEM is not set
394+
CONFIG_RTC_DRV_M48T59=y
394395
CONFIG_RTC_DRV_GENERIC=m
395396
# CONFIG_VIRTIO_MENU is not set
396397
# CONFIG_VHOST_MENU is not set

‎arch/m68k/configs/mvme16x_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,7 @@ CONFIG_UHID=m
392392
# CONFIG_USB_SUPPORT is not set
393393
CONFIG_RTC_CLASS=y
394394
# CONFIG_RTC_NVMEM is not set
395+
CONFIG_RTC_DRV_M48T59=y
395396
CONFIG_RTC_DRV_GENERIC=m
396397
# CONFIG_VIRTIO_MENU is not set
397398
# CONFIG_VHOST_MENU is not set

‎arch/m68k/include/asm/mvme147hw.h

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,7 @@
44

55
#include <asm/irq.h>
66

7-
typedef struct {
8-
unsigned char
9-
ctrl,
10-
bcd_sec,
11-
bcd_min,
12-
bcd_hr,
13-
bcd_dow,
14-
bcd_dom,
15-
bcd_mth,
16-
bcd_year;
17-
} MK48T02;
18-
19-
#define RTC_WRITE 0x80
20-
#define RTC_READ 0x40
21-
#define RTC_STOP 0x20
22-
23-
#define m147_rtc ((MK48T02 * volatile)0xfffe07f8)
24-
7+
#define MVME147_RTC_BASE 0xfffe0000
258

269
struct pcc_regs {
2710
volatile u_long dma_tadr;

‎arch/m68k/include/asm/mvme16xhw.h

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,7 @@ typedef struct {
2424

2525
#define mvmelp ((*(volatile MVMElpPtr)(MVME_LPR_BASE)))
2626

27-
typedef struct {
28-
unsigned char
29-
ctrl,
30-
bcd_sec,
31-
bcd_min,
32-
bcd_hr,
33-
bcd_dow,
34-
bcd_dom,
35-
bcd_mth,
36-
bcd_year;
37-
} MK48T08_t, *MK48T08ptr_t;
38-
39-
#define RTC_WRITE 0x80
40-
#define RTC_READ 0x40
41-
#define RTC_STOP 0x20
42-
43-
#define MVME_RTC_BASE 0xfffc1ff8
27+
#define MVME_RTC_BASE 0xfffc0000
4428

4529
#define MVME_I596_BASE 0xfff46000
4630

0 commit comments

Comments
 (0)