The following commit has been merged into the timers/core branch of tip:

Commit-ID:     ced7072a3ad65698f0ad378c8f8566379fe50723
Gitweb:        https://git.kernel.org/tip/ced7072a3ad65698f0ad378c8f8566379fe50723
Author:        Thomas Gleixner <tglx@kernel.org>
AuthorDate:    Sat, 24 Jan 2026 00:17:52 +01:00
Committer:     Thomas Gleixner <tglx@kernel.org>
CommitterDate: Thu, 12 Mar 2026 12:23:26 +01:00

MIPS: Don't select CLOCKSOURCE_WATCHDOG

MIPS selects CLOCKSOURCE_WATCHDOG, but none of the clocksources actually
sets the MUST_VERIFY flag. So compiling the watchdog in is a pointless
exercise. Remove the selects.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260123231521.723433371@kernel.org
---
 arch/mips/Kconfig           | 1 -
 drivers/clocksource/Kconfig | 1 -
 2 files changed, 2 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index e48b62b..4364f3d 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1131,7 +1131,6 @@ config CSRC_IOASIC
 	bool
 
 config CSRC_R4K
-	select CLOCKSOURCE_WATCHDOG if CPU_FREQ
 	bool
 
 config CSRC_SB1250
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index fd91127..d1a33a2 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -596,7 +596,6 @@ config CLKSRC_VERSATILE
 config CLKSRC_MIPS_GIC
 	bool
 	depends on MIPS_GIC
-	select CLOCKSOURCE_WATCHDOG
 	select TIMER_OF
 
 config CLKSRC_PXA