Commit 57963a92 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'timers-v5.19-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core 

Pull clockevent/clocksource driver updates from Daniel Lezcano:

  - Add Mediatek MT8186 DT bindings (Allen-KH Cheng)

  - Remove dead code corresponding of the IXP4xx board removal (Linus
    Walleij)

  - Add CLOCK_EVT_FEAT_C3STOP flag for the RISC-V SBI timer (Samuel
    Holland)

  - Do not return an error if there are multiple definitions of the sp804
    timers in the DT (Andre Przywara)

  - Add the missing SPDX identifier (Thomas Gleixner)

  - Remove an unncessary NULL check as it is done right before at probe
    time for the timer-ti-dm (Dan Carpenter)

  - Fix the irq_of_parse_and_map() return code check on onexas-nps
    (Krzysztof Kozlowski)

Link: https://lore.kernel.org/lkml/b5a83e54-1ee1-f910-4be4-bc3bf1015243@linaro.org
parents 317f29c1 9c04a8ff

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