Commit 4dcb9239 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 timekeeping updates from Thomas Gleixner:
 "The timers and timekeeping departement provides:

   - Another large y2038 update with further preparations for providing
     the y2038 safe timespecs closer to the syscalls.

   - An overhaul of the SHCMT clocksource driver

   - SPDX license identifier updates

   - Small cleanups and fixes all over the place"

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits)
  tick/sched : Remove redundant cpu_online() check
  clocksource/drivers/dw_apb: Add reset control
  clocksource: Remove obsolete CLOCKSOURCE_OF_DECLARE
  clocksource/drivers: Unify the names to timer-* format
  clocksource/drivers/sh_cmt: Add R-Car gen3 support
  dt-bindings: timer: renesas: cmt: document R-Car gen3 support
  clocksource/drivers/sh_cmt: Properly line-wrap sh_cmt_of_table[] initializer
  clocksource/drivers/sh_cmt: Fix clocksource width for 32-bit machines
  clocksource/drivers/sh_cmt: Fixup for 64-bit machines
  clocksource/drivers/sh_tmu: Convert to SPDX identifiers
  clocksource/drivers/sh_mtu2: Convert to SPDX identifiers
  clocksource/drivers/sh_cmt: Convert to SPDX identifiers
  clocksource/drivers/renesas-ostm: Convert to SPDX identifiers
  clocksource: Convert to using %pOFn instead of device_node.name
  tick/broadcast: Remove redundant check
  RISC-V: Request newstat syscalls
  y2038: signal: Change rt_sigtimedwait to use __kernel_timespec
  y2038: socket: Change recvmmsg to use __kernel_timespec
  y2038: sched: Change sched_rr_get_interval to use __kernel_timespec
  y2038: utimes: Rework #ifdef guards for compat syscalls
  ...
parents 3acbd2de d59e0ba1

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

+7 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ Required Properties: 
    - "renesas,r8a7793-cmt1" for the 48-bit CMT1 device included in r8a7793.

    - "renesas,r8a7794-cmt0" for the 32-bit CMT0 device included in r8a7794.

    - "renesas,r8a7794-cmt1" for the 48-bit CMT1 device included in r8a7794.

    - "renesas,r8a77970-cmt0" for the 32-bit CMT0 device included in r8a77970.

    - "renesas,r8a77970-cmt1" for the 48-bit CMT1 device included in r8a77970.

    - "renesas,r8a77980-cmt0" for the 32-bit CMT0 device included in r8a77980.

    - "renesas,r8a77980-cmt1" for the 48-bit CMT1 device included in r8a77980.



    - "renesas,rcar-gen2-cmt0" for 32-bit CMT0 devices included in R-Car Gen2

		and RZ/G1.
@@ -41,6 +45,9 @@ Required Properties: 
		and RZ/G1.

		These are fallbacks for r8a73a4, R-Car Gen2 and RZ/G1 entries

		listed above.

    - "renesas,rcar-gen3-cmt0" for 32-bit CMT0 devices included in R-Car Gen3.

    - "renesas,rcar-gen3-cmt1" for 48-bit CMT1 devices included in R-Car Gen3.

		These are fallbacks for R-Car Gen3 entries listed above.



  - reg: base address and length of the registers block for the timer module.

  - interrupts: interrupt-specifier for the timer, one per channel.

MAINTAINERS

+5 −5
Original line number Diff line number Diff line
@@ -1180,7 +1180,7 @@ N: owl 
F:	arch/arm/mach-actions/

F:	arch/arm/boot/dts/owl-*

F:	arch/arm64/boot/dts/actions/

F:	drivers/clocksource/owl-*

F:	drivers/clocksource/timer-owl*

F:	drivers/pinctrl/actions/*

F:	drivers/soc/actions/

F:	include/dt-bindings/power/owl-*
@@ -1603,7 +1603,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained

F:	arch/arm/boot/dts/lpc43*

F:	drivers/clk/nxp/clk-lpc18xx*

F:	drivers/clocksource/time-lpc32xx.c

F:	drivers/clocksource/timer-lpc32xx.c

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

F:	drivers/memory/pl172.c

F:	drivers/mtd/spi-nor/nxp-spifi.c
@@ -2220,7 +2220,7 @@ F: arch/arm/mach-vexpress/ 
F:	*/*/vexpress*

F:	*/*/*/vexpress*

F:	drivers/clk/versatile/clk-vexpress-osc.c

F:	drivers/clocksource/versatile.c

F:	drivers/clocksource/timer-versatile.c

N:	mps2



ARM/VFP SUPPORT
@@ -2242,7 +2242,7 @@ M: Tony Prisk <linux@prisktech.co.nz> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-vt8500/

F:	drivers/clocksource/vt8500_timer.c

F:	drivers/clocksource/timer-vt8500.c

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

F:	drivers/mmc/host/wmt-sdmmc.c

F:	drivers/pwm/pwm-vt8500.c
@@ -2307,7 +2307,7 @@ F: drivers/cpuidle/cpuidle-zynq.c 
F:	drivers/block/xsysace.c

N:	zynq

N:	xilinx

F:	drivers/clocksource/cadence_ttc_timer.c

F:	drivers/clocksource/timer-cadence-ttc.c

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

F:	drivers/mmc/host/sdhci-of-arasan.c

F:	drivers/edac/synopsys_edac.c

arch/alpha/include/asm/unistd.h

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


#define NR_SYSCALLS			523



#define __ARCH_WANT_NEW_STAT

#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_STAT64

#define __ARCH_WANT_SYS_GETHOSTNAME
@@ -13,6 +14,7 @@ 
#define __ARCH_WANT_SYS_GETPGRP

#define __ARCH_WANT_SYS_OLDUMOUNT

#define __ARCH_WANT_SYS_SIGPENDING

#define __ARCH_WANT_SYS_UTIME

#define __ARCH_WANT_SYS_FORK

#define __ARCH_WANT_SYS_VFORK

#define __ARCH_WANT_SYS_CLONE

arch/arc/include/uapi/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#define _UAPI_ASM_ARC_UNISTD_H



#define __ARCH_WANT_RENAMEAT

#define __ARCH_WANT_STAT64

#define __ARCH_WANT_SYS_EXECVE

#define __ARCH_WANT_SYS_CLONE

#define __ARCH_WANT_SYS_VFORK

arch/arm/include/asm/unistd.h

+2 −2
Original line number Diff line number Diff line
@@ -16,23 +16,23 @@ 
#include <uapi/asm/unistd.h>

#include <asm/unistd-nr.h>



#define __ARCH_WANT_NEW_STAT

#define __ARCH_WANT_STAT64

#define __ARCH_WANT_SYS_GETHOSTNAME

#define __ARCH_WANT_SYS_PAUSE

#define __ARCH_WANT_SYS_GETPGRP

#define __ARCH_WANT_SYS_LLSEEK

#define __ARCH_WANT_SYS_NICE

#define __ARCH_WANT_SYS_SIGPENDING

#define __ARCH_WANT_SYS_SIGPROCMASK

#define __ARCH_WANT_SYS_OLD_MMAP

#define __ARCH_WANT_SYS_OLD_SELECT

#define __ARCH_WANT_SYS_UTIME



#if !defined(CONFIG_AEABI) || defined(CONFIG_OABI_COMPAT)

#define __ARCH_WANT_SYS_TIME

#define __ARCH_WANT_SYS_IPC

#define __ARCH_WANT_SYS_OLDUMOUNT

#define __ARCH_WANT_SYS_ALARM

#define __ARCH_WANT_SYS_UTIME

#define __ARCH_WANT_SYS_OLD_GETRLIMIT

#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_SYS_SOCKETCALL

CRA Git | Maintained and supported by SUSTech CRA and CCSE