Commit 6cb5ce13 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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

Pull clocksource/event updates from Daniel Lezcano:

  - Added DT bindings for Mediatek MT8188 (Johnson Wang)

  - Added DT bindings for Renesas r8a779f0 (Wolfram Sang)

  - Added support for RZ/V2L SoC (Lad Prabhakar)

  - Rename TIMER_IRQ_EN to TIMER_IRQ_CLEAR to prevent confusion on sun4i
    (Victor Hassan)

  - Added support for Exynos ARTPEC-8 MCT, including DT bindings
    (Vincent Whitchurch)

  - Fixed handling of ARM erratum 858921 on the ARM Arch timer (Kunkun
    Jiang)

  - Added missing call platform_device_put() in the error path on ther
    GXP timer (Lin Yujun)

  - Cleaned the timer TI DM driver by self-encapsulating the code,
    dropping dead code and simplifying some functions (Tony Lindgren)

  - Added a DT property to tell the driver the clock is no longer
    divided on recent NXP hardware (Peng Fan)

  - Fixed the CNTPCT_LO and CNTVCT_LO values in the ARM arch timer (Yang
    Guo)

Link: https://lore.kernel.org/r/b28ac4b0-5745-b3a9-b7e7-cc86dcb1b023@linaro.org
parents cceeeb6a af246cc6

Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ Required properties: 
	For those SoCs that use SYST

	* "mediatek,mt8183-timer" for MT8183 compatible timers (SYST)

	* "mediatek,mt8186-timer" for MT8186 compatible timers (SYST)

	* "mediatek,mt8188-timer" for MT8188 compatible timers (SYST)

	* "mediatek,mt8192-timer" for MT8192 compatible timers (SYST)

	* "mediatek,mt8195-timer" for MT8195 compatible timers (SYST)

	* "mediatek,mt7629-timer" for MT7629 compatible timers (SYST)

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

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ properties: 
  clock-names:

    const: per



  nxp,no-divider:

    description: if present, means there is no internal base clk divider.

    type: boolean



required:

  - compatible

  - reg

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

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ properties: 
          - renesas,tmu-r8a77990 # R-Car E3

          - renesas,tmu-r8a77995 # R-Car D3

          - renesas,tmu-r8a779a0 # R-Car V3U

          - renesas,tmu-r8a779f0 # R-Car S4-8

      - const: renesas,tmu



  reg:

Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.yaml

+26 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ properties: 
          - samsung,exynos4412-mct

      - items:

          - enum:

              - axis,artpec8-mct

              - samsung,exynos3250-mct

              - samsung,exynos5250-mct

              - samsung,exynos5260-mct
@@ -45,6 +46,19 @@ properties: 
  reg:

    maxItems: 1



  samsung,frc-shared:

    type: boolean

    description: |

      Indicates that the hardware requires that this processor share the

      free-running counter with a different (main) processor.



  samsung,local-timers:

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

    minItems: 1

    maxItems: 16

    description: |

      List of indices of local timers usable from this processor.



  interrupts:

    description: |

      Interrupts should be put in specific order. This is, the local timer
@@ -74,6 +88,17 @@ required: 
  - reg



allOf:

  - if:

      not:

        properties:

          compatible:

            contains:

              enum:

                - axis,artpec8-mct

    then:

      properties:

        samsung,local-timers: false

        samsung,frc-shared: false

  - if:

      properties:

        compatible:
@@ -101,6 +126,7 @@ allOf: 
        compatible:

          contains:

            enum:

              - axis,artpec8-mct

              - samsung,exynos5260-mct

              - samsung,exynos5420-mct

              - samsung,exynos5433-mct

drivers/clocksource/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ config ATMEL_TCB_CLKSRC 
config CLKSRC_EXYNOS_MCT

	bool "Exynos multi core timer driver" if COMPILE_TEST

	depends on ARM || ARM64

	depends on ARCH_EXYNOS || COMPILE_TEST

	depends on ARCH_ARTPEC || ARCH_EXYNOS || COMPILE_TEST

	help

	  Support for Multi Core Timer controller on Exynos SoCs.