Commit 1b044f1c authored Jul 03, 2017 by Linus Torvalds

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

Pull timer updates from Thomas Gleixner:
 "A rather large update for timers/timekeeping:

   - compat syscall consolidation (Al Viro)

   - Posix timer consolidation (Christoph Helwig / Thomas Gleixner)

   - Cleanup of the device tree based initialization for clockevents and
     clocksources (Daniel Lezcano)

   - Consolidation of the FTTMR010 clocksource/event driver (Linus
     Walleij)

   - The usual set of small fixes and updates all over the place"

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (93 commits)
  timers: Make the cpu base lock raw
  clocksource/drivers/mips-gic-timer: Fix an error code in 'gic_clocksource_of_init()'
  clocksource/drivers/fsl_ftm_timer: Unmap region obtained by of_iomap
  clocksource/drivers/tcb_clksrc: Make IO endian agnostic
  clocksource/drivers/sun4i: Switch to the timer-of common init
  clocksource/drivers/timer-of: Fix invalid iomap check
  Revert "ktime: Simplify ktime_compare implementation"
  clocksource/drivers: Fix uninitialized variable use in timer_of_init
  kselftests: timers: Add test for frequency step
  kselftests: timers: Fix inconsistency-check to not ignore first timestamp
  time: Add warning about imminent deprecation of CONFIG_GENERIC_TIME_VSYSCALL_OLD
  time: Clean up CLOCK_MONOTONIC_RAW time handling
  posix-cpu-timers: Make timespec to nsec conversion safe
  itimer: Make timeval to nsec conversion range limited
  timers: Fix parameter description of try_to_del_timer_sync()
  ktime: Simplify ktime_compare implementation
  clocksource/drivers/fttmr010: Factor out clock read code
  clocksource/drivers/fttmr010: Implement delay timer
  clocksource/drivers: Add timer-of common init routine
  clocksource/drivers/tcb_clksrc: Save timer context on suspend/resume
  ...

parents e0f3e8f1 2287d866

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,11 @@ Required properties:

		- compatible : Must be one of
		"faraday,fttmr010"
		"cortina,gemini-timer"
		"cortina,gemini-timer", "faraday,fttmr010"
		"moxa,moxart-timer", "faraday,fttmr010"
		"aspeed,ast2400-timer"
		"aspeed,ast2500-timer"

		- reg : Should contain registers location and length
		- interrupts : Should contain the three timer interrupts usually with
		flags for falling edge

Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt

deleted100644 → 0

+0 −19

Original line number	Diff line number	Diff line
		MOXA ART timer

		Required properties:

		- compatible : Must be one of:
		- "moxa,moxart-timer"
		- "aspeed,ast2400-timer"
		- reg : Should contain registers location and length
		- interrupts : Should contain the timer interrupt number
		- clocks : Should contain phandle for the clock that drives the counter

		Example:

		timer: timer@98400000 {
		compatible = "moxa,moxart-timer";
		reg = <0x98400000 0x42>;
		interrupts = <19 1>;
		clocks = <&coreclk>;
		};

arch/arc/include/asm/Kbuild

+0 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ generic-y += preempt.h
		generic-y += resource.h
		generic-y += sembuf.h
		generic-y += shmbuf.h
		generic-y += siginfo.h
		generic-y += socket.h
		generic-y += sockios.h
		generic-y += stat.h

arch/arc/include/uapi/asm/Kbuild

+2 −0

Original line number	Diff line number	Diff line
		# UAPI Header export list
		include include/uapi/asm-generic/Kbuild.asm

		generic-y += siginfo.h

arch/arc/kernel/setup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -470,7 +470,7 @@ void __init setup_arch(char **cmdline_p)
		void __init time_init(void)
		{
		of_clk_init(NULL);
		clocksource_probe();
		timer_probe();
		}

		static int __init customize_machine(void)

Admin message