Commit 6a34fdcc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rtc-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux 

Pull RTC updates from Alexandre Belloni:
 "The bulk of the patches are about replacing the uie_unsupported struct
  rtc_device member by a feature bit.

  Subsystem:

   - remove uie_unsupported, all users have been converted to clear
     RTC_FEATURE_UPDATE_INTERRUPT and provide a reason

   - RTCs with an alarm with a resolution of a minute are now letting
     the core handle rounding down the alarm time

   - fix use-after-free on device removal

  New driver:

   - OP-TEE RTC PTA

  Drivers:

   - sun6i: Add H616 support

   - cmos: Fix the AltCentury for AMD platforms

   - spear: set range"

* tag 'rtc-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (56 commits)
  rtc: check if __rtc_read_time was successful
  rtc: gamecube: Fix refcount leak in gamecube_rtc_read_offset_from_sram
  rtc: mc146818-lib: Fix the AltCentury for AMD platforms
  rtc: optee: add RTC driver for OP-TEE RTC PTA
  rtc: pm8xxx: Return -ENODEV if set_time disallowed
  rtc: pm8xxx: Attach wake irq to device
  clk: sunxi-ng: sun6i-rtc: include clk/sunxi-ng.h
  rtc: remove uie_unsupported
  rtc: xgene: stop using uie_unsupported
  rtc: hym8563: switch to RTC_FEATURE_UPDATE_INTERRUPT
  rtc: hym8563: let the core handle the alarm resolution
  rtc: hym8563: switch to devm_rtc_allocate_device
  rtc: efi: switch to RTC_FEATURE_UPDATE_INTERRUPT
  rtc: efi: switch to devm_rtc_allocate_device
  rtc: add new RTC_FEATURE_ALARM_WAKEUP_ONLY feature
  rtc: spear: fix spear_rtc_read_time
  rtc: spear: drop uie_unsupported
  rtc: spear: set range
  rtc: spear: switch to devm_rtc_allocate_device
  rtc: pcf8563: switch to RTC_FEATURE_UPDATE_INTERRUPT
  ...
parents e8b767f5 915593a7

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

+72 −12
Original line number Diff line number Diff line
@@ -16,16 +16,22 @@ properties: 


  compatible:

    oneOf:

      - const: allwinner,sun6i-a31-rtc

      - const: allwinner,sun8i-a23-rtc

      - const: allwinner,sun8i-h3-rtc

      - const: allwinner,sun8i-r40-rtc

      - const: allwinner,sun8i-v3-rtc

      - const: allwinner,sun50i-h5-rtc

      - enum:

          - allwinner,sun6i-a31-rtc

          - allwinner,sun8i-a23-rtc

          - allwinner,sun8i-h3-rtc

          - allwinner,sun8i-r40-rtc

          - allwinner,sun8i-v3-rtc

          - allwinner,sun50i-h5-rtc

          - allwinner,sun50i-h6-rtc

          - allwinner,sun50i-h616-rtc

          - allwinner,sun50i-r329-rtc

      - items:

          - const: allwinner,sun50i-a64-rtc

          - const: allwinner,sun8i-h3-rtc

      - const: allwinner,sun50i-h6-rtc

      - items:

          - const: allwinner,sun20i-d1-rtc

          - const: allwinner,sun50i-r329-rtc



  reg:

    maxItems: 1
@@ -37,7 +43,12 @@ properties: 
      - description: RTC Alarm 1



  clocks:

    maxItems: 1

    minItems: 1

    maxItems: 4



  clock-names:

    minItems: 1

    maxItems: 4



  clock-output-names:

    minItems: 1
@@ -85,6 +96,7 @@ allOf: 
            enum:

              - allwinner,sun8i-h3-rtc

              - allwinner,sun50i-h5-rtc

              - allwinner,sun50i-h6-rtc



    then:

      properties:
@@ -96,19 +108,68 @@ allOf: 
      properties:

        compatible:

          contains:

            const: allwinner,sun50i-h6-rtc

            const: allwinner,sun50i-h616-rtc



    then:

      properties:

        clock-output-names:

        clocks:

          minItems: 3

          maxItems: 3

          items:

            - description: Bus clock for register access

            - description: 24 MHz oscillator

            - description: 32 kHz clock from the CCU



        clock-names:

          minItems: 3

          maxItems: 3

          items:

            - const: bus

            - const: hosc

            - const: pll-32k



      required:

        - clocks

        - clock-names



  - if:

      properties:

        compatible:

          contains:

            const: allwinner,sun8i-r40-rtc

            const: allwinner,sun50i-r329-rtc



    then:

      properties:

        clocks:

          minItems: 3

          maxItems: 4

          items:

            - description: Bus clock for register access

            - description: 24 MHz oscillator

            - description: AHB parent for internal SPI clock

            - description: External 32768 Hz oscillator



        clock-names:

          minItems: 3

          maxItems: 4

          items:

            - const: bus

            - const: hosc

            - const: ahb

            - const: ext-osc32k



      required:

        - clocks

        - clock-names



  - if:

      properties:

        compatible:

          contains:

            enum:

              - allwinner,sun8i-r40-rtc

              - allwinner,sun50i-h616-rtc

              - allwinner,sun50i-r329-rtc



    then:

      properties:
@@ -127,7 +188,6 @@ required: 
  - compatible

  - reg

  - interrupts

  - clock-output-names



additionalProperties: false

Documentation/devicetree/bindings/rtc/atmel,at91sam9-rtc.txt

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
Atmel AT91SAM9260 Real Time Timer



Required properties:

- compatible: should be one of the following:

	- "atmel,at91sam9260-rtt"

	- "microchip,sam9x60-rtt", "atmel,at91sam9260-rtt"

- reg: should encode the memory region of the RTT controller

- interrupts: rtt alarm/event interrupt

- clocks: should contain the 32 KHz slow clk that will drive the RTT block.

- atmel,rtt-rtc-time-reg: should encode the GPBR register used to store

	the time base when the RTT is used as an RTC.

	The first cell should point to the GPBR node and the second one

	encode the offset within the GPBR block (or in other words, the

	GPBR register used to store the time base).





Example:



rtt@fffffd20 {

	compatible = "atmel,at91sam9260-rtt";

	reg = <0xfffffd20 0x10>;

	interrupts = <1 4 7>;

	clocks = <&clk32k>;

	atmel,rtt-rtc-time-reg = <&gpbr 0x0>;

};

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

0 → 100644
+69 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

# Copyright (C) 2022 Microchip Technology, Inc. and its subsidiaries

%YAML 1.2

---

$id: http://devicetree.org/schemas/rtc/atmel,at91sam9260-rtt.yaml#

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



title: Atmel AT91 RTT Device Tree Bindings



allOf:

  - $ref: "rtc.yaml#"



maintainers:

  - Alexandre Belloni <alexandre.belloni@bootlin.com>



properties:

  compatible:

    oneOf:

      - items:

          - const: atmel,at91sam9260-rtt

      - items:

          - const: microchip,sam9x60-rtt

          - const: atmel,at91sam9260-rtt

      - items:

          - const: microchip,sama7g5-rtt

          - const: microchip,sam9x60-rtt

          - const: atmel,at91sam9260-rtt



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1



  atmel,rtt-rtc-time-reg:

    $ref: /schemas/types.yaml#/definitions/phandle-array

    items:

      - items:

          - description: Phandle to the GPBR node.

          - description: Offset within the GPBR block.

    description:

      Should encode the GPBR register used to store the time base when the

      RTT is used as an RTC. The first cell should point to the GPBR node

      and the second one encodes the offset within the GPBR block (or in

      other words, the GPBR register used to store the time base).



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - atmel,rtt-rtc-time-reg



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/irq.h>



    rtc@fffffd20 {

        compatible = "atmel,at91sam9260-rtt";

        reg = <0xfffffd20 0x10>;

        interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

        clocks = <&clk32k>;

        atmel,rtt-rtc-time-reg = <&gpbr 0x0>;

    };

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -14622,6 +14622,12 @@ L: op-tee@lists.trustedfirmware.org 
S:	Maintained

F:	drivers/char/hw_random/optee-rng.c









OP-TEE RTC DRIVER









M:	Clément Léger <clement.leger@bootlin.com>









L:	linux-rtc@vger.kernel.org









S:	Maintained









F:	drivers/rtc/rtc-optee.c

















OPA-VNIC DRIVER









M:	Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>









M:	Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
































drivers/clk/sunxi-ng/Kconfig



+5
−0






























Original line number
Diff line number
Diff line







@@ -69,6 +69,11 @@ config SUN6I_A31_CCU







	default MACH_SUN6I









	depends on MACH_SUN6I || COMPILE_TEST



















config SUN6I_RTC_CCU









	tristate "Support for the Allwinner H616/R329 RTC CCU"









	default ARCH_SUNXI









	depends on ARCH_SUNXI || COMPILE_TEST



















config SUN8I_A23_CCU









	tristate "Support for the Allwinner A23 CCU"









	default MACH_SUN8I