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 department delivers this time: - Support for cross clock domain timestamps in the core code plus a first user. That allows more precise timestamping for PTP and later for audio and other peripherals. The ptp/e1000e patches have been acked by the relevant maintainers and are carried in the timer tree to avoid merge ordering issues. - Support for unregistering the current clocksource watchdog. That lifts a limitation for switching clocksources which has been there from day 1 - The usual pile of fixes and updates to the core and the drivers. Nothing outstanding and exciting" * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (26 commits) time/timekeeping: Work around false positive GCC warning e1000e: Adds hardware supported cross timestamp on e1000e nic ptp: Add PTP_SYS_OFFSET_PRECISE for driver crosstimestamping x86/tsc: Always Running Timer (ART) correlated clocksource hrtimer: Revert CLOCK_MONOTONIC_RAW support time: Add history to cross timestamp interface supporting slower devices time: Add driver cross timestamp interface for higher precision time synchronization time: Remove duplicated code in ktime_get_raw_and_real() time: Add timekeeping snapshot code capturing system time and counter time: Add cycles to nanoseconds translation jiffies: Use CLOCKSOURCE_MASK instead of constant clocksource: Introduce clocksource_freq2mult() clockevents/drivers/exynos_mct: Implement ->set_state_oneshot_stopped() clockevents/drivers/arm_global_timer: Implement ->set_state_oneshot_stopped() clockevents/drivers/arm_arch_timer: Implement ->set_state_oneshot_stopped() clocksource/drivers/arm_global_timer: Register delay timer clocksource/drivers/lpc32xx: Support timer-based ARM delay clocksource/drivers/lpc32xx: Support periodic mode clocksource/drivers/lpc32xx: Don't use the prescaler counter for clockevents clocksource/drivers/rockchip: Add err handle for rk_timer_init ...
No related branches found
No related tags found
Showing
- Documentation/ptp/testptp.c 4 additions, 2 deletionsDocumentation/ptp/testptp.c
- arch/x86/include/asm/cpufeatures.h 1 addition, 1 deletionarch/x86/include/asm/cpufeatures.h
- arch/x86/include/asm/tsc.h 2 additions, 0 deletionsarch/x86/include/asm/tsc.h
- arch/x86/kernel/tsc.c 59 additions, 0 deletionsarch/x86/kernel/tsc.c
- drivers/clocksource/Kconfig 1 addition, 0 deletionsdrivers/clocksource/Kconfig
- drivers/clocksource/arm_arch_timer.c 32 additions, 8 deletionsdrivers/clocksource/arm_arch_timer.c
- drivers/clocksource/arm_global_timer.c 18 additions, 0 deletionsdrivers/clocksource/arm_global_timer.c
- drivers/clocksource/exynos_mct.c 2 additions, 0 deletionsdrivers/clocksource/exynos_mct.c
- drivers/clocksource/rockchip_timer.c 15 additions, 6 deletionsdrivers/clocksource/rockchip_timer.c
- drivers/clocksource/time-lpc32xx.c 53 additions, 13 deletionsdrivers/clocksource/time-lpc32xx.c
- drivers/net/ethernet/intel/Kconfig 9 additions, 0 deletionsdrivers/net/ethernet/intel/Kconfig
- drivers/net/ethernet/intel/e1000e/defines.h 5 additions, 0 deletionsdrivers/net/ethernet/intel/e1000e/defines.h
- drivers/net/ethernet/intel/e1000e/ptp.c 85 additions, 0 deletionsdrivers/net/ethernet/intel/e1000e/ptp.c
- drivers/net/ethernet/intel/e1000e/regs.h 4 additions, 0 deletionsdrivers/net/ethernet/intel/e1000e/regs.h
- drivers/ptp/ptp_chardev.c 27 additions, 0 deletionsdrivers/ptp/ptp_chardev.c
- include/linux/clockchips.h 2 additions, 2 deletionsinclude/linux/clockchips.h
- include/linux/clocksource.h 19 additions, 26 deletionsinclude/linux/clocksource.h
- include/linux/pps_kernel.h 6 additions, 11 deletionsinclude/linux/pps_kernel.h
- include/linux/ptp_clock_kernel.h 8 additions, 0 deletionsinclude/linux/ptp_clock_kernel.h
- include/linux/timekeeper_internal.h 2 additions, 0 deletionsinclude/linux/timekeeper_internal.h
Loading
Please register or sign in to comment