Skip to content

Commit de55409

Browse files
torvaldstorvalds
committed
Merge tag 'rtc-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC updates from Alexandre Belloni: "Mostly documentation/comment changes and non urgent fixes. - add or fix SPDX identifiers - NXP pcf*: fix datasheet URLs - imxdi: add wakeup support - pcf2127: handle timestamp interrupts, this fixes a possible interrupt storm - bd70528: Drop BD70528 support" * tag 'rtc-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (33 commits) rtc: pcf8523: rename register and bit defines rtc: pcf2127: handle timestamp interrupts rtc: at91sam9: Remove unnecessary offset variable checks rtc: s5m: Check return value of s5m_check_peding_alarm_interrupt() rtc: spear: convert to SPDX identifier rtc: tps6586x: convert to SPDX identifier rtc: tps80031: convert to SPDX identifier rtc: rtd119x: Fix format of SPDX identifier rtc: sc27xx: Fix format of SPDX identifier rtc: palmas: convert to SPDX identifier rtc: max6900: convert to SPDX identifier rtc: ds1374: convert to SPDX identifier rtc: au1xxx: convert to SPDX identifier rtc: pcf85063: Update the PCF85063A datasheet revision dt-bindings: rtc: ti,bq32k: take maintainership rtc: pcf8563: Fix the datasheet URL rtc: pcf85063: Fix the datasheet URL rtc: pcf2127: Fix the datasheet URL dt-bindings: rtc: ti,bq32k: Convert to json-schema dt-bindings: rtc: rx8900: Convert to YAML schema ...
2 parents 6bce244 + 4aa90c0 commit de55409

33 files changed

Lines changed: 440 additions & 601 deletions

‎Documentation/devicetree/bindings/rtc/epson,rx8900.txt‎

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

‎Documentation/devicetree/bindings/rtc/epson,rx8900.yaml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/rtc/epson,rx8900.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: EPSON RX8900 / Microcrystal RV8803 Real-Time Clock DT bindings
8+
9+
maintainers:
10+
- Marek Vasut <marex@denx.de>
11+
12+
allOf:
13+
- $ref: rtc.yaml#
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- epson,rx8900
19+
- microcrystal,rv8803
20+
21+
reg:
22+
maxItems: 1
23+
24+
epson,vdet-disable:
25+
type: boolean
26+
description: |
27+
Disable voltage detector. Should be set if no backup battery is used.
28+
29+
trickle-diode-disable: true
30+
31+
required:
32+
- compatible
33+
- reg
34+
35+
additionalProperties: false
36+
37+
examples:
38+
- |
39+
i2c {
40+
#address-cells = <1>;
41+
#size-cells = <0>;
42+
43+
rtc@32 {
44+
compatible = "epson,rx8900";
45+
reg = <0x32>;
46+
epson,vdet-disable;
47+
trickle-diode-disable;
48+
};
49+
};

‎Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt‎

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

‎Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/rtc/faraday,ftrtc010.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Faraday Technology FTRTC010 Real Time Clock
8+
9+
maintainers:
10+
- Linus Walleij <linus.walleij@linaro.org>
11+
12+
description: |
13+
This RTC appears in for example the Storlink Gemini family of SoCs.
14+
15+
properties:
16+
compatible:
17+
oneOf:
18+
- const: faraday,ftrtc010
19+
- items:
20+
- const: cortina,gemini-rtc
21+
- const: faraday,ftrtc010
22+
23+
resets:
24+
maxItems: 1
25+
26+
reg:
27+
maxItems: 1
28+
29+
interrupts:
30+
maxItems: 1
31+
32+
clocks:
33+
minItems: 2
34+
items:
35+
- description: PCLK clocks
36+
- description: EXTCLK clocks. Faraday calls it CLK1HZ and says the clock
37+
should be 1 Hz, but implementers actually seem to choose different
38+
clocks here, like Cortina who chose 32768 Hz (a typical low-power clock).
39+
40+
clock-names:
41+
items:
42+
- const: "PCLK"
43+
- const: "EXTCLK"
44+
45+
required:
46+
- compatible
47+
48+
additionalProperties: false
49+
50+
examples:
51+
- |
52+
#include <dt-bindings/interrupt-controller/irq.h>
53+
rtc@45000000 {
54+
compatible = "cortina,gemini-rtc", "faraday,ftrtc010";
55+
reg = <0x45000000 0x100>;
56+
interrupts = <17 IRQ_TYPE_LEVEL_HIGH>;
57+
clocks = <&foo 0>, <&foo 1>;
58+
clock-names = "PCLK", "EXTCLK";
59+
};

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,19 @@ Optional properties:
2121
clock name
2222
- wakeup-source: Enables wake up of host system on alarm
2323

24+
Optional child node:
25+
- clock: Provide this if the square wave pin is used as boot-enabled fixed clock.
26+
2427
Example:
2528
rtc@68 {
2629
compatible = "st,m41t80";
2730
reg = <0x68>;
2831
interrupt-parent = <&UIC0>;
2932
interrupts = <0x9 0x8>;
33+
34+
clock {
35+
compatible = "fixed-clock";
36+
#clock-cells = <0>;
37+
clock-frequency = <32768>;
38+
};
3039
};

‎Documentation/devicetree/bindings/rtc/ti,bq32000.yaml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
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,bq32000.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: TI BQ32000 I2C Serial Real-Time Clock
8+
9+
maintainers:
10+
- Alexandre Belloni <alexandre.belloni@bootlin.com>
11+
12+
allOf:
13+
- $ref: rtc.yaml#
14+
15+
properties:
16+
compatible:
17+
const: ti,bq32000
18+
19+
reg:
20+
const: 0x68
21+
22+
interrupts:
23+
maxItems: 1
24+
25+
start-year: true
26+
27+
trickle-resistor-ohms:
28+
enum: [ 1120, 20180 ]
29+
30+
trickle-diode-disable: true
31+
32+
required:
33+
- compatible
34+
- reg
35+
36+
additionalProperties: false
37+
38+
examples:
39+
- |
40+
i2c {
41+
#address-cells = <1>;
42+
#size-cells = <0>;
43+
44+
bq32000: rtc@68 {
45+
compatible = "ti,bq32000";
46+
reg = <0x68>;
47+
trickle-resistor-ohms = <1120>;
48+
};
49+
};

‎Documentation/devicetree/bindings/rtc/ti,bq32k.txt‎

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

‎drivers/rtc/Kconfig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -501,11 +501,11 @@ config RTC_DRV_M41T80_WDT
501501
watchdog timer in the ST M41T60 and M41T80 RTC chips series.
502502

503503
config RTC_DRV_BD70528
504-
tristate "ROHM BD70528, BD71815 and BD71828 PMIC RTC"
505-
depends on MFD_ROHM_BD71828 || MFD_ROHM_BD70528 && (BD70528_WATCHDOG || !BD70528_WATCHDOG)
504+
tristate "ROHM BD71815 and BD71828 PMIC RTC"
505+
depends on MFD_ROHM_BD71828
506506
help
507507
If you say Y here you will get support for the RTC
508-
block on ROHM BD70528, BD71815 and BD71828 Power Management IC.
508+
block on ROHM BD71815 and BD71828 Power Management IC.
509509

510510
This driver can also be built as a module. If so, the module
511511
will be called rtc-bd70528.

‎drivers/rtc/proc.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ static bool is_rtc_hctosys(struct rtc_device *rtc)
2323
int size;
2424
char name[NAME_SIZE];
2525

26-
size = scnprintf(name, NAME_SIZE, "rtc%d", rtc->id);
27-
if (size > NAME_SIZE)
26+
size = snprintf(name, NAME_SIZE, "rtc%d", rtc->id);
27+
if (size >= NAME_SIZE)
2828
return false;
2929

3030
return !strncmp(name, CONFIG_RTC_HCTOSYS_DEVICE, NAME_SIZE);

‎drivers/rtc/rtc-at91sam9.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ static int at91_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm)
184184
return -EILSEQ;
185185

186186
memset(alrm, 0, sizeof(*alrm));
187-
if (alarm != ALARM_DISABLED && offset != 0) {
187+
if (alarm != ALARM_DISABLED) {
188188
rtc_time64_to_tm(offset + alarm, tm);
189189

190190
dev_dbg(dev, "%s: %ptR\n", __func__, tm);

0 commit comments

Comments
 (0)