Commit fd048992 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'timers-core-2022-01-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer updates from Thomas Gleixner:
 "Updates for the time(r) subsystem:

  Core:

   - Make the clocksource watchdog more robust by better validation
     checks of the measurement.

  Drivers:

   - New drivers for MStar and SSD20xd SOCs

   - The usual cleanups and improvements all over the place"

* tag 'timers-core-2022-01-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  dt-bindings: timer: Add Mstar MSC313e timer devicetree bindings documentation
  clocksource/drivers/msc313e: Add support for ssd20xd-based platforms
  clocksource/drivers: Add MStar MSC313e timer support
  clocksource/drivers/pistachio: Fix -Wunused-but-set-variable warning
  clocksource/drivers/timer-imx-sysctr: Set cpumask to cpu_possible_mask
  clocksource/drivers/imx-sysctr: Mark two variable with __ro_after_init
  clocksource/drivers/renesas,ostm: Make RENESAS_OSTM symbol visible
  clocksource/drivers/renesas-ostm: Add RZ/G2L OSTM support
  dt-bindings: timer: renesas: ostm: Document Renesas RZ/G2L OSTM
  clocksource/drivers/exynos_mct: Fix silly typo resulting in checkpatch warning
  clocksource: Reduce the default clocksource_watchdog() retries to 2
  clocksource: Avoid accidental unstable marking of clocksources
  dt-bindings: timer: tpm-timer: Add imx8ulp compatible string
  reset: Add of_reset_control_get_optional_exclusive()
  clocksource/drivers/exynos_mct: Refactor resources allocation
  dt-bindings: timer: remove rockchip,rk3066-timer compatible string from rockchip,rk-timer.yaml
  dt-bindings: timer: cadence_ttc: Add power-domains
parents 147cc583 35e13e9d

Documentation/admin-guide/kernel-parameters.txt

+2 −2
Original line number Diff line number Diff line
@@ -612,8 +612,8 @@ 
	clocksource.max_cswd_read_retries= [KNL]

			Number of clocksource_watchdog() retries due to

			external delays before the clock will be marked

			unstable.  Defaults to three retries, that is,

			four attempts to read the clock under test.

			unstable.  Defaults to two retries, that is,

			three attempts to read the clock under test.



	clocksource.verify_n_cpus= [KNL]

			Limit the number of CPUs checked for clocksources

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: