Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ead6581 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 changes from Thomas Gleixner:
 "This assorted collection provides:

   - A new timer based timer broadcast feature for systems which do not
     provide a global accessible timer device.  That allows those
     systems to put CPUs into deep idle states where the per cpu timer
     device stops.

   - A few NOHZ_FULL related improvements to the timer wheel

   - The usual updates to timer devices found in ARM SoCs

   - Small improvements and updates all over the place"

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (44 commits)
  tick: Remove code duplication in tick_handle_periodic()
  tick: Fix spelling mistake in tick_handle_periodic()
  x86: hpet: Use proper destructor for delayed work
  workqueue: Provide destroy_delayed_work_on_stack()
  clocksource: CMT, MTU2, TMU and STI should depend on GENERIC_CLOCKEVENTS
  timer: Remove code redundancy while calling get_nohz_timer_target()
  hrtimer: Rearrange comments in the order struct members are declared
  timer: Use variable head instead of &work_list in __run_timers()
  clocksource: exynos_mct: silence a static checker warning
  arm: zynq: Add support for cpufreq
  arm: zynq: Don't use arm_global_timer with cpufreq
  clocksource/cadence_ttc: Overhaul clocksource frequency adjustment
  clocksource/cadence_ttc: Call clockevents_update_freq() with IRQs enabled
  clocksource: Add Kconfig entries for CMT, MTU2, TMU and STI
  sh: Remove Kconfig entries for TMU, CMT and MTU2
  ARM: shmobile: Remove CMT, TMU and STI Kconfig entries
  clocksource: armada-370-xp: Use atomic access for shared registers
  clocksource: orion: Use atomic access for shared registers
  clocksource: timer-keystone: Delete unnecessary variable
  clocksource: timer-keystone: introduce clocksource driver for Keystone
  ...
parents b6d739e9 b97f0291

Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Allwinner A1X SoCs Timer Controller 


Required properties:



- compatible : should be "allwinner,sun4i-timer"

- compatible : should be "allwinner,sun4i-a10-timer"

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

- interrupts : The interrupt of the first timer

- clocks: phandle to the source clock (usually a 24 MHz fixed clock)
@@ -10,7 +10,7 @@ Required properties: 
Example:



timer {

	compatible = "allwinner,sun4i-timer";

	compatible = "allwinner,sun4i-a10-timer";

	reg = <0x01c20c00 0x400>;

	interrupts = <22>;

	clocks = <&osc>;

Documentation/devicetree/bindings/timer/ti,keystone-timer.txt

0 → 100644
+29 −0
Original line number Diff line number Diff line 
* Device tree bindings for Texas instruments Keystone timer



This document provides bindings for the 64-bit timer in the KeyStone

architecture devices. The timer can be configured as a general-purpose 64-bit

timer, dual general-purpose 32-bit timers. When configured as dual 32-bit

timers, each half can operate in conjunction (chain mode) or independently

(unchained mode) of each other.



It is global timer is a free running up-counter and can generate interrupt

when the counter reaches preset counter values.



Documentation:

http://www.ti.com/lit/ug/sprugv5a/sprugv5a.pdf



Required properties:



- compatible : should be "ti,keystone-timer".

- reg : specifies base physical address and count of the registers.

- interrupts : interrupt generated by the timer.

- clocks : the clock feeding the timer clock.



Example:



timer@22f0000 {

	compatible = "ti,keystone-timer";

	reg = <0x022f0000 0x80>;

	interrupts = <GIC_SPI 110 IRQ_TYPE_EDGE_RISING>;

	clocks = <&clktimer15>;

};

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1320,6 +1320,7 @@ M: Linus Walleij <linus.walleij@linaro.org> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Supported

F:	arch/arm/mach-u300/

F:	drivers/clocksource/timer-u300.c

F:	drivers/i2c/busses/i2c-stu300.c

F:	drivers/rtc/rtc-coh901331.c

F:	drivers/watchdog/coh901327_wdt.c

arch/arm/boot/dts/sun4i-a10.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ 
		};



		timer@01c20c00 {

			compatible = "allwinner,sun4i-timer";

			compatible = "allwinner,sun4i-a10-timer";

			reg = <0x01c20c00 0x90>;

			interrupts = <22>;

			clocks = <&osc24M>;

arch/arm/boot/dts/sun5i-a10s.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ 
		};



		timer@01c20c00 {

			compatible = "allwinner,sun4i-timer";

			compatible = "allwinner,sun4i-a10-timer";

			reg = <0x01c20c00 0x90>;

			interrupts = <22>;

			clocks = <&osc24M>;