Commit c049ecc5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'timers-core-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull clockevent/clocksource updates from Thomas Gleixner:

 - Device tree bindings for MT8186

 - Tell the kernel that the RISC-V SBI timer stops in deeper power
   states

 - Make device tree parsing in sp804 more robust

 - Dead code removal and tiny fixes here and there

 - Add the missing SPDX identifiers

* tag 'timers-core-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/drivers/oxnas-rps: Fix irq_of_parse_and_map() return value
  clocksource/drivers/timer-ti-dm: Remove unnecessary NULL check
  clocksource/drivers/timer-sun5i: Convert to SPDX identifier
  clocksource/drivers/timer-sun4i: Convert to SPDX identifier
  clocksource/drivers/pistachio: Convert to SPDX identifier
  clocksource/drivers/orion: Convert to SPDX identifier
  clocksource/drivers/lpc32xx: Convert to SPDX identifier
  clocksource/drivers/digicolor: Convert to SPDX identifier
  clocksource/drivers/armada-370-xp: Convert to SPDX identifier
  clocksource/drivers/mips-gic-timer: Convert to SPDX identifier
  clocksource/drivers/jcore: Convert to SPDX identifier
  clocksource/drivers/bcm_kona: Convert to SPDX identifier
  clocksource/drivers/sp804: Avoid error on multiple instances
  clocksource/drivers/riscv: Events are stopped during CPU suspend
  clocksource/drivers/ixp4xx: Drop boardfile probe path
  dt-bindings: timer: Add compatible for Mediatek MT8186
parents bc1e02c3 57963a92

Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ Required properties: 


	For those SoCs that use SYST

	* "mediatek,mt8183-timer" for MT8183 compatible timers (SYST)

	* "mediatek,mt8186-timer" for MT8186 compatible timers (SYST)

	* "mediatek,mt8192-timer" for MT8192 compatible timers (SYST)

	* "mediatek,mt8195-timer" for MT8195 compatible timers (SYST)

	* "mediatek,mt7629-timer" for MT7629 compatible timers (SYST)

drivers/clocksource/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ config IXP4XX_TIMER 
	bool "Intel XScale IXP4xx timer driver" if COMPILE_TEST

	depends on HAS_IOMEM

	select CLKSRC_MMIO

	select TIMER_OF if OF

	select TIMER_OF

	help

	  Enables support for the Intel XScale IXP4xx SoC timer.

drivers/clocksource/bcm_kona_timer.c

+2 −12
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 Broadcom Corporation

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation version 2.

 *

 * This program is distributed "as is" WITHOUT ANY WARRANTY of any

 * kind, whether express or implied; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */

// SPDX-License-Identifier: GPL-2.0

// Copyright (C) 2012 Broadcom Corporation



#include <linux/init.h>

#include <linux/irq.h>

drivers/clocksource/jcore-pit.c

+1 −4
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * J-Core SoC PIT/clocksource driver

 *

 * Copyright (C) 2015-2016 Smart Energy Instruments, Inc.

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */



#include <linux/kernel.h>

drivers/clocksource/mips-gic-timer.c

+2 −7
Original line number Diff line number Diff line 
/*

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.

 */

// SPDX-License-Identifier: GPL-2.0

// Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.



#define pr_fmt(fmt) "mips-gic-timer: " fmt