Commit 5f2eac77 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RTC updates from Alexandre Belloni:

 - loongson: Loongson-2K0300 support

 - s35390a: nvmem support

 - zynqmp: rework calibration

* tag 'rtc-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  rtc: ds1390: fix number of bytes read from RTC
  rtc: class: Remove duplicate check for alarm
  rtc: optee: simplify OP-TEE context match
  rtc: interface: Alarm race handling should not discard preceding error
  rtc: s35390a: implement nvmem support
  rtc: loongson: Add Loongson-2K0300 support
  dt-bindings: rtc: loongson: Document Loongson-2K0300 compatible
  dt-bindings: rtc: loongson: Correct Loongson-1C interrupts property
  dt-bindings: rtc: renesas,rz-rtca3: Add RZ/V2N support
  dt-bindings: rtc: cpcap: convert to schema
  rtc: zynqmp: use dynamic max and min offset ranges
  rtc: zynqmp: rework set_offset
  rtc: zynqmp: rework read_offset
  rtc: zynqmp: check calibration max value
  rtc: zynqmp: correct frequency value
  rtc: amlogic-a4: Remove IRQF_ONESHOT
  rtc: pcf8563: use correct of_node for output clock
  rtc: max31335: use correct CONFIG symbol in IS_REACHABLE()
  rtc: nvvrs: Add ARCH_TEGRA to the NV VRS RTC driver
parents 1dd41914 969c3cca

Documentation/devicetree/bindings/rtc/cpcap-rtc.txt

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
Motorola CPCAP PMIC RTC

-----------------------



This module is part of the CPCAP. For more details about the whole

chip see Documentation/devicetree/bindings/mfd/motorola-cpcap.txt.



Requires node properties:

- compatible: should contain "motorola,cpcap-rtc"

- interrupts: An interrupt specifier for alarm and 1 Hz irq



Example:



&cpcap {

	cpcap_rtc: rtc {

		compatible = "motorola,cpcap-rtc";

		interrupts = <39 IRQ_TYPE_NONE>, <26 IRQ_TYPE_NONE>;

	};

};

Documentation/devicetree/bindings/rtc/loongson,rtc.yaml

+13 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ properties: 
          - loongson,ls1b-rtc

          - loongson,ls1c-rtc

          - loongson,ls7a-rtc

          - loongson,ls2k0300-rtc

          - loongson,ls2k1000-rtc

      - items:

          - enum:
@@ -42,6 +43,18 @@ required: 


unevaluatedProperties: false



if:

  properties:

    compatible:

      contains:

        enum:

          - loongson,ls1c-rtc

          - loongson,ls2k0300-rtc



then:

  properties:

    interrupts: false



examples:

  - |

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

Documentation/devicetree/bindings/rtc/motorola,cpcap-rtc.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/rtc/motorola,cpcap-rtc.yaml#

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



title: Motorola CPCAP PMIC RTC



maintainers:

  - Svyatoslav Ryhel <clamor95@gmail.com>



description:

  This module is part of the Motorola CPCAP MFD device. For more details

  see Documentation/devicetree/bindings/mfd/motorola,cpcap.yaml. The

  RTC is represented as a sub-node of the PMIC node on the device tree.



properties:

  compatible:

    const: motorola,cpcap-rtc



  interrupts:

    items:

      - description: alarm interrupt

      - description: 1 Hz interrupt



required:

  - compatible

  - interrupts



additionalProperties: false



...

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

+4 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ properties: 
    items:

      - enum:

          - renesas,r9a08g045-rtca3 # RZ/G3S

          - renesas,r9a09g056-rtca3 # RZ/V2N

          - renesas,r9a09g057-rtca3 # RZ/V2H

      - const: renesas,rz-rtca3
@@ -82,7 +83,9 @@ allOf: 
      properties:

        compatible:

          contains:

            const: renesas,r9a09g057-rtca3

            enum:

              - renesas,r9a09g056-rtca3

              - renesas,r9a09g057-rtca3

    then:

      properties:

        resets:

drivers/rtc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -418,6 +418,7 @@ config RTC_DRV_SPACEMIT_P1 


config RTC_DRV_NVIDIA_VRS10

	tristate "NVIDIA VRS10 RTC device"

	depends on ARCH_TEGRA || COMPILE_TEST

	help

	  If you say yes here you will get support for the battery backed RTC device

	  of NVIDIA VRS (Voltage Regulator Specification). The RTC is connected via