Commit 00164f47 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'timers-core-2024-03-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull more clocksource updates from Thomas Gleixner:
 "A set of updates for clocksource and clockevent drivers:

   - A fix for the prescaler of the ARM global timer where the prescaler
     mask define only covered 4 bits while it is actully 8 bits wide.
     This obviously restricted the possible range of prescaler
     adjustments

   - A fix for the RISC-V timer which prevents a timer interrupt being
     raised while the timer is initialized

   - A set of device tree updates to support new system on chips in
     various drivers

   - Kernel-doc and other cleanups all over the place"

* tag 'timers-core-2024-03-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization
  dt-bindings: timer: Add support for cadence TTC PWM
  clocksource/drivers/arm_global_timer: Simplify prescaler register access
  clocksource/drivers/arm_global_timer: Guard against division by zero
  clocksource/drivers/arm_global_timer: Make gt_target_rate unsigned long
  dt-bindings: timer: add Ralink SoCs system tick counter
  clocksource: arm_global_timer: fix non-kernel-doc comment
  clocksource/drivers/arm_global_timer: Remove stray tab
  clocksource/drivers/arm_global_timer: Fix maximum prescaler value
  clocksource/drivers/imx-sysctr: Add i.MX95 support
  clocksource/drivers/imx-sysctr: Drop use global variables
  dt-bindings: timer: nxp,sysctr-timer: support i.MX95
  dt-bindings: timer: renesas: ostm: Document RZ/Five SoC
  dt-bindings: timer: renesas,tmu: Document input capture interrupt
  clocksource/drivers/ti-32K: Fix misuse of "/**" comment
  clocksource/drivers/stm32: Fix all kernel-doc warnings
  dt-bindings: timer: exynos4210-mct: Add google,gs101-mct compatible
  clocksource/drivers/imx: Fix -Wunused-but-set-variable warning
parents 1a391931 86c54c84

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

+21 −1
Original line number Diff line number Diff line
@@ -32,12 +32,23 @@ properties: 
    description: |

      Bit width of the timer, necessary if not 16.



  "#pwm-cells":

    const: 3



required:

  - compatible

  - reg

  - interrupts

  - clocks



allOf:

  - if:

      not:

        required:

          - "#pwm-cells"

    then:

      required:

        - interrupts



additionalProperties: false



examples:
@@ -50,3 +61,12 @@ examples: 
        clocks = <&cpu_clk 3>;

        timer-width = <32>;

    };



  - |

    pwm: pwm@f8002000 {

        compatible = "cdns,ttc";

        reg = <0xf8002000 0x1000>;

        clocks = <&cpu_clk 3>;

        timer-width = <32>;

        #pwm-cells = <3>;

    };

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

+3 −1
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ description: | 


properties:

  compatible:

    const: nxp,sysctr-timer

    enum:

      - nxp,imx95-sysctr-timer

      - nxp,sysctr-timer



  reg:

    maxItems: 1

Documentation/devicetree/bindings/timer/ralink,cevt-systick.yaml

0 → 100644
+38 −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/ralink,cevt-systick.yaml#

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



title: System tick counter present in Ralink family SoCs



maintainers:

  - Sergio Paracuellos <sergio.paracuellos@gmail.com>



properties:

  compatible:

    const: ralink,cevt-systick



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts



additionalProperties: false



examples:

  - |

    systick@d00 {

        compatible = "ralink,cevt-systick";

        reg = <0xd00 0x10>;



        interrupt-parent = <&cpuintc>;

        interrupts = <7>;

    };

...

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

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ properties: 
      - enum:

          - renesas,r7s72100-ostm  # RZ/A1H

          - renesas,r7s9210-ostm   # RZ/A2M

          - renesas,r9a07g043-ostm # RZ/G2UL

          - renesas,r9a07g043-ostm # RZ/G2UL and RZ/Five

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

          - renesas,r9a07g054-ostm # RZ/V2L

      - const: renesas,ostm        # Generic

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

+16 −2
Original line number Diff line number Diff line
@@ -46,7 +46,19 @@ properties: 


  interrupts:

    minItems: 2

    maxItems: 3

    items:

      - description: Underflow interrupt, channel 0

      - description: Underflow interrupt, channel 1

      - description: Underflow interrupt, channel 2

      - description: Input capture interrupt, channel 2



  interrupt-names:

    minItems: 2

    items:

      - const: tuni0

      - const: tuni1

      - const: tuni2

      - const: ticpi2



  clocks:

    maxItems: 1
@@ -100,7 +112,9 @@ examples: 
            reg = <0xffd80000 0x30>;

            interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>,

                         <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>,

                         <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;

                         <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>,

                         <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;

            interrupt-names = "tuni0", "tuni1", "tuni2", "ticpi2";

            clocks = <&mstp0_clks R8A7779_CLK_TMU0>;

            clock-names = "fck";

            power-domains = <&sysc R8A7779_PD_ALWAYS_ON>;