Commit 174ddfd5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer updates from Thomas Gleixner:
 "The timer departement delivers:

   - more year 2038 rework

   - a massive rework of the arm achitected timer

   - preparatory patches to allow NTP correction of clock event devices
     to avoid early expiry

   - the usual pile of fixes and enhancements all over the place"

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (91 commits)
  timer/sysclt: Restrict timer migration sysctl values to 0 and 1
  arm64/arch_timer: Mark errata handlers as __maybe_unused
  Clocksource/mips-gic: Remove redundant non devicetree init
  MIPS/Malta: Probe gic-timer via devicetree
  clocksource: Use GENMASK_ULL in definition of CLOCKSOURCE_MASK
  acpi/arm64: Add SBSA Generic Watchdog support in GTDT driver
  clocksource: arm_arch_timer: add GTDT support for memory-mapped timer
  acpi/arm64: Add memory-mapped timer support in GTDT driver
  clocksource: arm_arch_timer: simplify ACPI support code.
  acpi/arm64: Add GTDT table parse driver
  clocksource: arm_arch_timer: split MMIO timer probing.
  clocksource: arm_arch_timer: add structs to describe MMIO timer
  clocksource: arm_arch_timer: move arch_timer_needs_of_probing into DT init call
  clocksource: arm_arch_timer: refactor arch_timer_needs_probing
  clocksource: arm_arch_timer: split dt-only rate handling
  x86/uv/time: Set ->min_delta_ticks and ->max_delta_ticks
  unicore32/time: Set ->min_delta_ticks and ->max_delta_ticks
  um/time: Set ->min_delta_ticks and ->max_delta_ticks
  tile/time: Set ->min_delta_ticks and ->max_delta_ticks
  score/time: Set ->min_delta_ticks and ->max_delta_ticks
  ...
parents 3cb66535 b94bf594

Documentation/arm64/silicon-errata.txt

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ stable kernels. 
| ARM            | Cortex-A57      | #852523         | N/A                         |

| ARM            | Cortex-A57      | #834220         | ARM64_ERRATUM_834220        |

| ARM            | Cortex-A72      | #853709         | N/A                         |

| ARM            | Cortex-A73      | #858921         | ARM64_ERRATUM_858921        |

| ARM            | MMU-500         | #841119,#826419 | N/A                         |

|                |                 |                 |                             |

| Cavium         | ThunderX ITS    | #22375, #24313  | CAVIUM_ERRATUM_22375        |

Documentation/devicetree/bindings/timer/cortina,gemini-timer.txt

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
Cortina Systems Gemini timer



This timer is embedded in the Cortina Systems Gemini SoCs.



Required properties:



- compatible : Must be "cortina,gemini-timer"

- reg : Should contain registers location and length

- interrupts : Should contain the three timer interrupts with

  flags for rising edge

- syscon : a phandle to the global Gemini system controller



Example:



timer@43000000 {

	compatible = "cortina,gemini-timer";

	reg = <0x43000000 0x1000>;

	interrupts = <14 IRQ_TYPE_EDGE_RISING>, /* Timer 1 */

		   <15 IRQ_TYPE_EDGE_RISING>, /* Timer 2 */

		   <16 IRQ_TYPE_EDGE_RISING>; /* Timer 3 */

	syscon = <&syscon>;

};

Documentation/devicetree/bindings/timer/faraday,fttmr010.txt

0 → 100644
+33 −0
Original line number Diff line number Diff line 
Faraday Technology timer



This timer is a generic IP block from Faraday Technology, embedded in the

Cortina Systems Gemini SoCs and other designs.



Required properties:



- compatible : Must be one of

  "faraday,fttmr010"

  "cortina,gemini-timer"

- reg : Should contain registers location and length

- interrupts : Should contain the three timer interrupts usually with

  flags for falling edge



Optionally required properties:



- clocks : a clock to provide the tick rate for "faraday,fttmr010"

- clock-names : should be "EXTCLK" and "PCLK" for the external tick timer

  and peripheral clock respectively, for "faraday,fttmr010"

- syscon : a phandle to the global Gemini system controller if the compatible

  type is "cortina,gemini-timer"



Example:



timer@43000000 {

	compatible = "faraday,fttmr010";

	reg = <0x43000000 0x1000>;

	interrupts = <14 IRQ_TYPE_EDGE_FALLING>, /* Timer 1 */

		   <15 IRQ_TYPE_EDGE_FALLING>, /* Timer 2 */

		   <16 IRQ_TYPE_EDGE_FALLING>; /* Timer 3 */

	clocks = <&extclk>, <&pclk>;

	clock-names = "EXTCLK", "PCLK";

};

Documentation/devicetree/bindings/timer/rockchip,rk-timer.txt

+9 −3
Original line number Diff line number Diff line 
Rockchip rk timer



Required properties:

- compatible: shall be one of:

  "rockchip,rk3288-timer" - for rk3066, rk3036, rk3188, rk322x, rk3288, rk3368

  "rockchip,rk3399-timer" - for rk3399

- compatible: should be:

  "rockchip,rk3036-timer", "rockchip,rk3288-timer": for Rockchip RK3036

  "rockchip,rk3066-timer", "rockchip,rk3288-timer": for Rockchip RK3066

  "rockchip,rk3188-timer", "rockchip,rk3288-timer": for Rockchip RK3188

  "rockchip,rk3228-timer", "rockchip,rk3288-timer": for Rockchip RK3228

  "rockchip,rk3229-timer", "rockchip,rk3288-timer": for Rockchip RK3229

  "rockchip,rk3288-timer": for Rockchip RK3288

  "rockchip,rk3368-timer", "rockchip,rk3288-timer": for Rockchip RK3368

  "rockchip,rk3399-timer": for Rockchip RK3399

- reg: base address of the timer register starting with TIMERS CONTROL register

- interrupts: should contain the interrupts for Timer0

- clocks : must contain an entry for each entry in clock-names

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -11119,6 +11119,7 @@ F: drivers/power/supply/bq27xxx_battery_i2c.c 
TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER

M:	John Stultz <john.stultz@linaro.org>

M:	Thomas Gleixner <tglx@linutronix.de>

R:	Stephen Boyd <sboyd@codeaurora.org>

L:	linux-kernel@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core

S:	Supported

CRA Git | Maintained and supported by SUSTech CRA and CCSE