Commit 55be6084 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull timer updates from Thomas Gleixner:
 "A boring time, timekeeping, timers update:

   - No core code changes

   - No new clocksource/event driver

   - Cleanup of the TI DM clocksource/event driver

   - The usual set of device tree binding updates

   - Small improvement, fixes and cleanups all over the place"

* tag 'timers-core-2022-10-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (22 commits)
  clocksource/drivers/arm_arch_timer: Fix CNTPCT_LO and CNTVCT_LO value
  clocksource/drivers/imx-sysctr: handle nxp,no-divider property
  dt-bindings: timer: nxp,sysctr-timer: add nxp,no-divider property
  clocksource/drivers/timer-ti-dm: Get clock in probe with devm_clk_get()
  clocksource/drivers/timer-ti-dm: Add flag to detect omap1
  clocksource/drivers/timer-ti-dm: Move struct omap_dm_timer fields to driver
  clocksource/drivers/timer-ti-dm: Use runtime PM directly and check errors
  clocksource/drivers/timer-ti-dm: Move private defines to the driver
  clocksource/drivers/timer-ti-dm: Simplify register access further
  clocksource/drivers/timer-ti-dm: Simplify register writes with dmtimer_write()
  clocksource/drivers/timer-ti-dm: Simplify register reads with dmtimer_read()
  clocksource/drivers/timer-ti-dm: Drop unused functions
  clocksource/drivers/timer-gxp: Add missing error handling in gxp_timer_probe
  clocksource/drivers/arm_arch_timer: Fix handling of ARM erratum 858921
  clocksource/drivers/exynos_mct: Enable building on ARTPEC
  clocksource/drivers/exynos_mct: Support local-timers property
  clocksource/drivers/exynos_mct: Support frc-shared property
  dt-bindings: timer: exynos4210-mct: Add ARTPEC-8 MCT support
  clocksource/drivers/sun4i: Add definition of clear interrupt
  clocksource/drivers/renesas-ostm: Add support for RZ/V2L SoC
  ...
parents 7f6dcffb 6cb5ce13

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.