Commit 6629c076 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'timers-v5.17-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core 

Pull clocksource/events updates from Daniel Lezcano:

 - Refactor resource allocation on the Exynos_mct driver without
   functional changes (Marek Szyprowski)

 - Add imx8ulp compatible string for NPX TPM driver (Jacky Bai)

 - Fix comma introduced by error by replacing it by the initial
   semicolon on the Exynos_mct (Will Deacon)

 - Add OSTM driver support on Renesas. The reset line must be
   deasserted before accessing the registers. This change depends on an
   external change resulting in a shared immutable branch
   'reset/of-get-optional-exclusive' from
   git://git.pengutronix.de/pza/linux (Biju Das)

 - Make the OSTM Kconfig option visible to user in order to let him
   disable it when ARM architected timers is enabled (Biju Das)

 - Tag two variables on iMX sysctr _ro_afterinit (Peng Fan)

 - Set the cpumask to cpu_possible_mask in order to have full benefit
   of the DYNIRQ flag on iMX sysctr (Peng Fan)

 - Tag __maybe_unused a variable in the Pistachio timer driver in order
   to fix a warning reported by the kernel test robot (Drew Fustini)

 - Add MStar MSC313e timer support and the ssd20xd-based variant, as
   well as the DT bindings (Romain Perier)

 - Remove the incompatible compatible string for the rk3066 (Johan
   Jonker)

 - Fix dts_check warnings on the cadence ttc driver by adding the power
   domain bindings (Michal Simek)

Link: https://lore.kernel.org/lkml/e093c706-c98d-29ee-0102-78b6d41c6164@linaro.org
parents 2585cf9d 7647204c

Documentation/devicetree/bindings/timer/cdns,ttc.yaml

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ properties: 
  clocks:

    maxItems: 1



  power-domains:

    maxItems: 1



  timer-width:

    $ref: "/schemas/types.yaml#/definitions/uint32"

    description: |

Documentation/devicetree/bindings/timer/mstar,msc313e-timer.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/timer/mstar,msc313e-timer.yaml#

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



title: Mstar MSC313e Timer Device Tree Bindings



maintainers:

  - Daniel Palmer <daniel@0x0f.com>

  - Romain Perier <romain.perier@gmail.com>



properties:

  compatible:

    enum:

      - mstar,msc313e-timer

      - sstar,ssd20xd-timer



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts

  - clocks



additionalProperties: false



examples:

  - |

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



    timer@6040 {

        compatible = "mstar,msc313e-timer";

        reg = <0x6040 0x40>;

        clocks = <&xtal_div2>;

        interrupts-extended = <&intc_fiq GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;

    };

...

Documentation/devicetree/bindings/timer/nxp,tpm-timer.yaml

+5 −1
Original line number Diff line number Diff line
@@ -19,7 +19,11 @@ description: | 


properties:

  compatible:

    const: fsl,imx7ulp-tpm

    oneOf:

      - const: fsl,imx7ulp-tpm

      - items:

          - const: fsl,imx8ulp-tpm

          - const: fsl,imx7ulp-tpm



  reg:

    maxItems: 1

Documentation/devicetree/bindings/timer/renesas,ostm.yaml

+17 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ properties: 
      - enum:

          - renesas,r7s72100-ostm  # RZ/A1H

          - renesas,r7s9210-ostm   # RZ/A2M

          - renesas,r9a07g044-ostm # RZ/G2{L,LC}

      - const: renesas,ostm        # Generic



  reg:
@@ -37,6 +38,9 @@ properties: 
  power-domains:

    maxItems: 1



  resets:

    maxItems: 1



required:

  - compatible

  - reg
@@ -44,6 +48,16 @@ required: 
  - clocks

  - power-domains



if:

  properties:

    compatible:

      contains:

        enum:

          - renesas,r9a07g044-ostm

then:

  required:

    - resets



additionalProperties: false



examples:

Documentation/devicetree/bindings/timer/rockchip,rk-timer.yaml

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ properties: 
          - enum:

              - rockchip,rv1108-timer

              - rockchip,rk3036-timer

              - rockchip,rk3066-timer

              - rockchip,rk3188-timer

              - rockchip,rk3228-timer

              - rockchip,rk3229-timer