Commit 6376c077 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'timers-clocksource-2025-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull clocksource updates from Thomas Gleixner:
 "Updates for clocksource/clockevent drivers:

   - The final conversion of text formatted device tree binding to
     schemas

   - A new driver fot the System Timer Module on S32G NXP SoCs

   - A new driver fot the Econet HPT timer

   - The usual improvements and device tree binding updates"

* tag 'timers-clocksource-2025-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits)
  clocksource/drivers/renesas-ostm: Unconditionally enable reprobe support
  dt-bindings: timer: renesas,ostm: Document RZ/V2N (R9A09G056) support
  dt-bindings: timer: Convert marvell,armada-370-timer to DT schema
  dt-bindings: timer: Convert ti,keystone-timer to DT schema
  dt-bindings: timer: Convert st,spear-timer to DT schema
  dt-bindings: timer: Convert socionext,milbeaut-timer to DT schema
  dt-bindings: timer: Convert snps,arc-timer to DT schema
  dt-bindings: timer: Convert snps,archs-rtc to DT schema
  dt-bindings: timer: Convert snps,archs-gfrc to DT schema
  dt-bindings: timer: Convert lsi,zevio-timer to DT schema
  dt-bindings: timer: Convert jcore,pit to DT schema
  dt-bindings: timer: Convert img,pistachio-gptimer to DT schema
  dt-bindings: timer: Convert ezchip,nps400-timer to DT schema
  dt-bindings: timer: Convert cirrus,clps711x-timer to DT schema
  dt-bindings: timer: Convert altr,timer-1.0 to DT schema
  dt-bindings: timer: Add ESWIN EIC7700 CLINT
  clocksource/drivers: Add EcoNet Timer HPT driver
  dt-bindings: timer: Add EcoNet EN751221 "HPT" CPU Timer
  dt-bindings: timer: Convert arm,mps2-timer to DT schema
  dt-bindings: timer: Add Sophgo SG2044 ACLINT timer
  ...
parents 5e8bbb2c 29857e6f

Documentation/devicetree/bindings/timer/altr,timer-1.0.txt

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
Altera Timer



Required properties:



- compatible : should be "altr,timer-1.0"

- reg : Specifies base physical address and size of the registers.

- interrupts : Should contain the timer interrupt number

- clock-frequency : The frequency of the clock that drives the counter, in Hz.



Example:



timer {

	compatible = "altr,timer-1.0";

	reg = <0x00400000 0x00000020>;

	interrupt-parent = <&cpu>;

	interrupts = <11>;

	clock-frequency = <125000000>;

};

Documentation/devicetree/bindings/timer/altr,timer-1.0.yaml

0 → 100644
+39 −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/altr,timer-1.0.yaml#

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



title: Altera Timer



maintainers:

  - Dinh Nguyen <dinguyen@kernel.org>



properties:

  compatible:

    const: altr,timer-1.0



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clock-frequency:

    description: Frequency of the clock that drives the counter, in Hz.



required:

  - compatible

  - reg

  - interrupts



additionalProperties: false



examples:

  - |

    timer@400000 {

        compatible = "altr,timer-1.0";

        reg = <0x00400000 0x00000020>;

        interrupts = <11>;

        clock-frequency = <125000000>;

    };

Documentation/devicetree/bindings/timer/arm,mps2-timer.txt

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
ARM MPS2 timer



The MPS2 platform has simple general-purpose 32 bits timers.



Required properties:

- compatible	: Should be "arm,mps2-timer"

- reg		: Address and length of the register set

- interrupts	: Reference to the timer interrupt



Required clocking property, have to be one of:

- clocks	  : The input clock of the timer

- clock-frequency : The rate in HZ in input of the ARM MPS2 timer



Examples:



timer1: mps2-timer@40000000 {

	compatible = "arm,mps2-timer";

	reg = <0x40000000 0x1000>;

	interrupts = <8>;

	clocks = <&sysclk>;

};



timer2: mps2-timer@40001000 {

	compatible = "arm,mps2-timer";

	reg = <0x40001000 0x1000>;

	interrupts = <9>;

	clock-frequency = <25000000>;

};

Documentation/devicetree/bindings/timer/arm,mps2-timer.yaml

0 → 100644
+49 −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/arm,mps2-timer.yaml#

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



title: ARM MPS2 timer



maintainers:

  - Vladimir Murzin <vladimir.murzin@arm.com>



description:

  The MPS2 platform has simple general-purpose 32 bits timers.



properties:

  compatible:

    const: arm,mps2-timer



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1



  clock-frequency:

    description: Rate in Hz of the timer input clock



oneOf:

  - required: [clocks]

  - required: [clock-frequency]



required:

  - compatible

  - reg

  - interrupts



additionalProperties: false



examples:

  - |

    timer@40000000 {

        compatible = "arm,mps2-timer";

        reg = <0x40000000 0x1000>;

        interrupts = <8>;

        clocks = <&sysclk>;

    };

Documentation/devicetree/bindings/timer/cirrus,clps711x-timer.txt

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
* Cirrus Logic CLPS711X Timer Counter



Required properties:

- compatible: Shall contain "cirrus,ep7209-timer".

- reg       : Address and length of the register set.

- interrupts: The interrupt number of the timer.

- clocks    : phandle of timer reference clock.



Note: Each timer should have an alias correctly numbered in "aliases" node.



Example:

	aliases {

		timer0 = &timer1;

		timer1 = &timer2;

	};



	timer1: timer@80000300 {

		compatible = "cirrus,ep7312-timer", "cirrus,ep7209-timer";

		reg = <0x80000300 0x4>;

		interrupts = <8>;

		clocks = <&clks 5>;

	};



	timer2: timer@80000340 {

		compatible = "cirrus,ep7312-timer", "cirrus,ep7209-timer";

		reg = <0x80000340 0x4>;

		interrupts = <9>;

		clocks = <&clks 6>;

	};