Commit 7b3efb50 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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

Pull clocksource/event updates from Daniel Lezcano:

 - Add dt bindings for the wpcm450 and the timer declaration (Jonathan
   Neuschäfer)

 - Add dt bindings for the JZ4760, the timer declaration for the
   ingenic ost and timer (Paul Cercueil)

 - Add dt bindings for the cmt r8a779a0 (Wolfram Sang)

 - Add dt bindings for the cmt r8a77961 (Niklas Söderlund)

 - Add missing dt bindings for the tmu r8a7795, r8a7796, r8a77961, r8a77965,
   r8a77990 and r8a77995 (Niklas Söderlund)

 - Check pending post before writing a new post in register for the
   timer TI dm and add the stopped callback ops to prevent any
   spurious interrupt (Tony Lindgren)

 - Fix return value check at init when calling device_node_to_regmap()
   for the Ingenic OST timer (Wei Yongjun)

 - Fix a trivial typo s/overflw/overflow/ for the pistachio timer (Drew Fustini)

 - Don't use CMTOUT_IE with R-Car Gen2/3 (Wolfram Sang)

 - Fix rollback when the initialization fails on the dw_apb timer (Dinh Nguyen)

 - Switch to timer TI dm on dra7 in order to prevent using the bogus
   architected timer which fails to wrap correctly after 388 days (Tony Lindgren)

 - Add function annotation to optimize memory for the ARM architected
   timer (Jisheng Zhang)
parents d4c7c288 81208911

Documentation/devicetree/bindings/timer/ingenic,tcu.yaml

+22 −8
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ select: 
        enum:

          - ingenic,jz4740-tcu

          - ingenic,jz4725b-tcu

          - ingenic,jz4760-tcu

          - ingenic,jz4760b-tcu

          - ingenic,jz4770-tcu

          - ingenic,jz4780-tcu

          - ingenic,x1000-tcu
@@ -52,12 +54,15 @@ properties: 
          - enum:

              - ingenic,jz4740-tcu

              - ingenic,jz4725b-tcu

              - ingenic,jz4770-tcu

              - ingenic,jz4760-tcu

              - ingenic,x1000-tcu

          - const: simple-mfd

      - items:

          - const: ingenic,jz4780-tcu

          - const: ingenic,jz4770-tcu

          - enum:

              - ingenic,jz4780-tcu

              - ingenic,jz4770-tcu

              - ingenic,jz4760b-tcu

          - const: ingenic,jz4760-tcu

          - const: simple-mfd



  reg:
@@ -118,6 +123,8 @@ patternProperties: 
          - items:

              - enum:

                  - ingenic,jz4770-watchdog

                  - ingenic,jz4760b-watchdog

                  - ingenic,jz4760-watchdog

                  - ingenic,jz4725b-watchdog

              - const: ingenic,jz4740-watchdog
@@ -147,6 +154,8 @@ patternProperties: 
              - ingenic,jz4725b-pwm

          - items:

              - enum:

                  - ingenic,jz4760-pwm

                  - ingenic,jz4760b-pwm

                  - ingenic,jz4770-pwm

                  - ingenic,jz4780-pwm

              - const: ingenic,jz4740-pwm
@@ -183,10 +192,15 @@ patternProperties: 
        oneOf:

          - enum:

              - ingenic,jz4725b-ost

              - ingenic,jz4770-ost

              - ingenic,jz4760b-ost

          - items:

              - const: ingenic,jz4760-ost

              - const: ingenic,jz4725b-ost

          - items:

              - const: ingenic,jz4780-ost

              - const: ingenic,jz4770-ost

              - enum:

                  - ingenic,jz4780-ost

                  - ingenic,jz4770-ost

              - const: ingenic,jz4760b-ost



      reg:

        maxItems: 1
@@ -226,7 +240,7 @@ examples: 
    #include <dt-bindings/clock/jz4770-cgu.h>

    #include <dt-bindings/clock/ingenic,tcu.h>

    tcu: timer@10002000 {

      compatible = "ingenic,jz4770-tcu", "simple-mfd";

      compatible = "ingenic,jz4770-tcu", "ingenic,jz4760-tcu", "simple-mfd";

      reg = <0x10002000 0x1000>;

      #address-cells = <1>;

      #size-cells = <1>;
@@ -272,7 +286,7 @@ examples: 
      };



      ost: timer@e0 {

        compatible = "ingenic,jz4770-ost";

        compatible = "ingenic,jz4770-ost", "ingenic,jz4760b-ost";

        reg = <0xe0 0x20>;



        clocks = <&tcu TCU_CLK_OST>;

Documentation/devicetree/bindings/timer/nuvoton,npcm7xx-timer.txt

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ Nuvoton NPCM7xx have three timer modules, each timer module provides five 24-bit 
timer counters.



Required properties:

- compatible      : "nuvoton,npcm750-timer" for Poleg NPCM750.

- compatible      : "nuvoton,npcm750-timer" for Poleg NPCM750, or

                    "nuvoton,wpcm450-timer" for Hermon WPCM450.

- reg             : Offset and length of the register set for the device.

- interrupts      : Contain the timer interrupt of timer 0.

- clocks          : phandle of timer reference clock (usually a 25 MHz clock).

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

+4 −0
Original line number Diff line number Diff line
@@ -74,11 +74,13 @@ properties: 
              - renesas,r8a774e1-cmt0     # 32-bit CMT0 on RZ/G2H

              - renesas,r8a7795-cmt0      # 32-bit CMT0 on R-Car H3

              - renesas,r8a7796-cmt0      # 32-bit CMT0 on R-Car M3-W

              - renesas,r8a77961-cmt0     # 32-bit CMT0 on R-Car M3-W+

              - renesas,r8a77965-cmt0     # 32-bit CMT0 on R-Car M3-N

              - renesas,r8a77970-cmt0     # 32-bit CMT0 on R-Car V3M

              - renesas,r8a77980-cmt0     # 32-bit CMT0 on R-Car V3H

              - renesas,r8a77990-cmt0     # 32-bit CMT0 on R-Car E3

              - renesas,r8a77995-cmt0     # 32-bit CMT0 on R-Car D3

              - renesas,r8a779a0-cmt0     # 32-bit CMT0 on R-Car V3U

          - const: renesas,rcar-gen3-cmt0 # 32-bit CMT0 on R-Car Gen3 and RZ/G2



      - items:
@@ -89,11 +91,13 @@ properties: 
              - renesas,r8a774e1-cmt1     # 48-bit CMT on RZ/G2H

              - renesas,r8a7795-cmt1      # 48-bit CMT on R-Car H3

              - renesas,r8a7796-cmt1      # 48-bit CMT on R-Car M3-W

              - renesas,r8a77961-cmt1     # 48-bit CMT on R-Car M3-W+

              - renesas,r8a77965-cmt1     # 48-bit CMT on R-Car M3-N

              - renesas,r8a77970-cmt1     # 48-bit CMT on R-Car V3M

              - renesas,r8a77980-cmt1     # 48-bit CMT on R-Car V3H

              - renesas,r8a77990-cmt1     # 48-bit CMT on R-Car E3

              - renesas,r8a77995-cmt1     # 48-bit CMT on R-Car D3

              - renesas,r8a779a0-cmt1     # 48-bit CMT on R-Car V3U

          - const: renesas,rcar-gen3-cmt1 # 48-bit CMT on R-Car Gen3 and RZ/G2



  reg:

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

+6 −0
Original line number Diff line number Diff line
@@ -28,8 +28,14 @@ properties: 
          - renesas,tmu-r8a774e1 # RZ/G2H

          - renesas,tmu-r8a7778  # R-Car M1A

          - renesas,tmu-r8a7779  # R-Car H1

          - renesas,tmu-r8a7795  # R-Car H3

          - renesas,tmu-r8a7796  # R-Car M3-W

          - renesas,tmu-r8a77961 # R-Car M3-W+

          - renesas,tmu-r8a77965 # R-Car M3-N

          - renesas,tmu-r8a77970 # R-Car V3M

          - renesas,tmu-r8a77980 # R-Car V3H

          - renesas,tmu-r8a77990 # R-Car E3

          - renesas,tmu-r8a77995 # R-Car D3

      - const: renesas,tmu



  reg:

arch/arm/boot/dts/dra7-l4.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1168,7 +1168,7 @@ 
			};

		};



		target-module@34000 {			/* 0x48034000, ap 7 46.0 */

		timer3_target: target-module@34000 {	/* 0x48034000, ap 7 46.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			reg = <0x34000 0x4>,

			      <0x34010 0x4>;
@@ -1195,7 +1195,7 @@ 
			};

		};



		target-module@36000 {			/* 0x48036000, ap 9 4e.0 */

		timer4_target: target-module@36000 {	/* 0x48036000, ap 9 4e.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			reg = <0x36000 0x4>,

			      <0x36010 0x4>;