Skip to content

Commit d2f51b3

Browse files
committed
Merge tag 'rtc-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC updates from Alexandre Belloni: "There is a new driver for the RTC of the Mstar SSD202D SoC. The rtc7301 driver gains support for byte addresses to support the USRobotics USR8200. Then we have many non user visible changes and typo fixes. Summary: Subsytem: - convert platform drivers to remove_new - prevent modpost warnings for unremovable platform drivers New driver: - Mstar SSD202D Drivers: - brcmstb-waketimer: support level alarm_irq - ep93xx: add DT support - rtc7301: support byte-addressed IO" * tag 'rtc-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (28 commits) dt-bindings: rtc: Add Mstar SSD202D RTC rtc: Add support for the SSD202D RTC rtc: at91rm9200: annotate at91_rtc_remove with __exit again dt-bindings: rtc: microcrystal,rv3032: Document wakeup-source property dt-bindings: rtc: pcf8523: Convert to YAML dt-bindings: rtc: mcp795: move to trivial-rtc rtc: ep93xx: add DT support for Cirrus EP93xx dt-bindings: rtc: Add Cirrus EP93xx dt-bindings: rtc: pcf2123: convert to YAML rtc: efi: fixed typo in efi_procfs() rtc: omap: Use device_get_match_data() rtc: pcf85363: fix wrong mask/val parameters in regmap_update_bits call rtc: rtc7301: Support byte-addressed IO rtc: rtc7301: Rewrite bindings in schema rtc: sh: Convert to platform remove callback returning void rtc: pxa: Convert to platform remove callback returning void rtc: mv: Convert to platform remove callback returning void rtc: imxdi: Convert to platform remove callback returning void rtc: at91rm9200: Convert to platform remove callback returning void rtc: pcap: Drop no-op remove function ...
2 parents 7b2c9e4 + cfb6762 commit d2f51b3

26 files changed

+620
-108
lines changed
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/rtc/cirrus,ep9301-rtc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Cirrus EP93xx Real Time Clock controller
8+
9+
maintainers:
10+
- Hartley Sweeten <hsweeten@visionengravers.com>
11+
- Alexander Sverdlin <alexander.sverdlin@gmail.com>
12+
13+
allOf:
14+
- $ref: rtc.yaml#
15+
16+
properties:
17+
compatible:
18+
oneOf:
19+
- const: cirrus,ep9301-rtc
20+
- items:
21+
- enum:
22+
- cirrus,ep9302-rtc
23+
- cirrus,ep9307-rtc
24+
- cirrus,ep9312-rtc
25+
- cirrus,ep9315-rtc
26+
- const: cirrus,ep9301-rtc
27+
28+
reg:
29+
maxItems: 1
30+
31+
required:
32+
- compatible
33+
- reg
34+
35+
unevaluatedProperties: false
36+
37+
examples:
38+
- |
39+
rtc@80920000 {
40+
compatible = "cirrus,ep9301-rtc";
41+
reg = <0x80920000 0x100>;
42+
};

Documentation/devicetree/bindings/rtc/epson,rtc7301.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
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,rtc7301.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Epson Toyocom RTC-7301SF/DG
8+
9+
description:
10+
The only difference between the two variants is the packaging.
11+
The DG variant is a DIL package, and the SF variant is a flat
12+
package.
13+
14+
maintainers:
15+
- Akinobu Mita <akinobu.mita@gmail.com>
16+
17+
properties:
18+
compatible:
19+
enum:
20+
- epson,rtc7301dg
21+
- epson,rtc7301sf
22+
23+
reg:
24+
maxItems: 1
25+
26+
reg-io-width:
27+
description:
28+
The size (in bytes) of the IO accesses that should be performed
29+
on the device.
30+
enum: [1, 4]
31+
default: 4
32+
33+
interrupts:
34+
maxItems: 1
35+
36+
required:
37+
- compatible
38+
- reg
39+
40+
additionalProperties: false
41+
42+
examples:
43+
- |
44+
#include <dt-bindings/interrupt-controller/irq.h>
45+
rtc: rtc@44a00000 {
46+
compatible = "epson,rtc7301dg";
47+
reg = <0x44a00000 0x10000>;
48+
reg-io-width = <4>;
49+
interrupt-parent = <&axi_intc_0>;
50+
interrupts = <3 2>;
51+
};

Documentation/devicetree/bindings/rtc/maxim,mcp795.txt

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

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ properties:
3838
- 3000
3939
- 4400
4040

41+
wakeup-source: true
42+
4143
required:
4244
- compatible
4345
- reg
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/rtc/mstar,ssd202d-rtc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Mstar SSD202D Real Time Clock
8+
9+
maintainers:
10+
- Daniel Palmer <daniel@0x0f.com>
11+
- Romain Perier <romain.perier@gmail.com>
12+
13+
allOf:
14+
- $ref: rtc.yaml#
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- mstar,ssd202d-rtc
20+
reg:
21+
maxItems: 1
22+
23+
required:
24+
- compatible
25+
- reg
26+
27+
unevaluatedProperties: false
28+
29+
examples:
30+
- |
31+
rtc@6800 {
32+
compatible = "mstar,ssd202d-rtc";
33+
reg = <0x6800 0x200>;
34+
};
35+
...
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
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,pcf2123.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NXP PCF2123 SPI Real Time Clock
8+
9+
maintainers:
10+
- Javier Carrasco <javier.carrasco.cruz@gmail.com>
11+
12+
allOf:
13+
- $ref: /schemas/spi/spi-peripheral-props.yaml#
14+
- $ref: rtc.yaml#
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- nxp,pcf2123
20+
21+
reg:
22+
maxItems: 1
23+
24+
interrupts:
25+
maxItems: 1
26+
27+
required:
28+
- compatible
29+
- reg
30+
31+
unevaluatedProperties: false
32+
33+
examples:
34+
- |
35+
#include <dt-bindings/interrupt-controller/arm-gic.h>
36+
spi {
37+
#address-cells = <1>;
38+
#size-cells = <0>;
39+
40+
rtc@3 {
41+
compatible = "nxp,pcf2123";
42+
reg = <3>;
43+
interrupts = <GIC_SPI 130 IRQ_TYPE_LEVEL_LOW>;
44+
spi-cs-high;
45+
};
46+
};
47+
...

Documentation/devicetree/bindings/rtc/nxp,pcf8523.txt

Lines changed: 0 additions & 18 deletions
This file was deleted.
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/nxp,pcf8523.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NXP PCF8523 Real Time Clock
8+
9+
maintainers:
10+
- Sam Ravnborg <sam@ravnborg.org>
11+
12+
allOf:
13+
- $ref: rtc.yaml#
14+
15+
properties:
16+
compatible:
17+
const: nxp,pcf8523
18+
19+
reg:
20+
maxItems: 1
21+
22+
quartz-load-femtofarads:
23+
description:
24+
The capacitive load of the crystal, expressed in femto Farad (fF).
25+
enum: [ 7000, 12500 ]
26+
default: 12500
27+
28+
required:
29+
- compatible
30+
- reg
31+
32+
unevaluatedProperties: false
33+
34+
examples:
35+
- |
36+
i2c {
37+
#address-cells = <1>;
38+
#size-cells = <0>;
39+
40+
rtc@68 {
41+
compatible = "nxp,pcf8523";
42+
reg = <0x68>;
43+
quartz-load-femtofarads = <7000>;
44+
};
45+
};

Documentation/devicetree/bindings/rtc/nxp,rtc-2123.txt

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

0 commit comments

Comments
 (0)