From nobody Sat Jun 13 23:24:28 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DCABB45000; Sat, 13 Jun 2026 14:33:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781361183; cv=none; b=Mmx/E33FW/vNu+vwlipbbm0bueyIodvtvNcoPlcqmXKORYDtNmWBaUlCRGzIL5+6Ebj5Q5ryr3T43czWXwlodcpRMtGmZ6dbX/huzgcWsbPlbTJ2glgyPufT8qtQikrqGkdrWABwYyH3NtRq48492Xubvhy4eNT6KiSCZkA13zU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781361183; c=relaxed/simple; bh=W/jOwsSd79w8/Y1ws23JNV03bcLJzXbuqqCJ6jb2sLM=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=MlDS+niazFUSM4H62NRe8hiT0LytkyokL3gVDPeQGsmvWkaMPNFRTNCbjXfVLwZhB0lq1MVrdH5PBBvKsm7eclTrdX2o2Zqn8LLfK6MyucpdzaCmMQ/1rNCqZaSNENFicrbqMSfys3j7CenF3Cs41DSi7CxYThkbGgwXgpPIBx0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=V7TxnEbw; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=EEAD5tnn; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="V7TxnEbw"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="EEAD5tnn" Date: Sat, 13 Jun 2026 14:32:57 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1781361179; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JtQcHoX9jNIU8p76qR/+4NIUh+KGRV8jSo4YfBMDJLo=; b=V7TxnEbwns2ximzfHAXEBKFCZNksGVsk3Fn38m+9vJEQecVPSN9lWF5Letzr1jpjwoBEJZ NVc5B3DI/3Yzw8zCRH8MgXUXMI/45ULxbTknjB57gldwWDpa5N0NVMeSQyXYhW4+NFprbh YmC80RnIRg6G++4hRNGkl5Nid09CtHO3lJnfsZbTTuq3uQII+ZKkmoGtKO/cj5UNzCO1rZ j+120Uk64pzRM9vnQZ8IMBNVajt9r9Kw9N0DGnVvUD2isGbQMHb0nDj/jmH3ucxKPceZKE lSYgl948GFovAxy/3XYyq/dVKXmtfNPfYjcL46f6x6xucVNqxTd29OJ78yRjYA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1781361179; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JtQcHoX9jNIU8p76qR/+4NIUh+KGRV8jSo4YfBMDJLo=; b=EEAD5tnnUEpL9VOwURb0aMiYijEEROZvxrQFtRZAXPNozYfBs2JqvK4XIrV9sNMoX0wBNJ b2NHPy5ON+M5x5Aw== From: "tip-bot2 for Enric Balletbo i Serra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/clocksource] clocksource: move NXP timer selection to drivers/clocksource Cc: Enric Balletbo i Serra , Daniel Lezcano , Frank Li , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260514-fix-nxp-timer-v3-1-a3e68fdb505e@redhat.com> References: <20260514-fix-nxp-timer-v3-1-a3e68fdb505e@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178136117794.1650852.16922985587557656896.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the timers/clocksource branch of = tip: Commit-ID: a9ac745bc320cbdc2ed3c851eb78f91f22ff975b Gitweb: https://git.kernel.org/tip/a9ac745bc320cbdc2ed3c851eb78f91f2= 2ff975b Author: Enric Balletbo i Serra AuthorDate: Thu, 14 May 2026 13:14:17 +02:00 Committer: Daniel Lezcano CommitterDate: Wed, 10 Jun 2026 07:26:07 +02:00 clocksource: move NXP timer selection to drivers/clocksource The Kconfig logic for selecting the scheduler clocksource on NXP Vybrid (VF610) uses a `choice` block restricted to 32-bit ARM. This prevents 64-bit architectures, such as the NXP S32 family, from enabling the NXP Periodic Interrupt Timer (PIT) driver (CONFIG_NXP_PIT_TIMER). Relocate the NXP clocksource selection from arch/arm/mach-imx/Kconfig to drivers/clocksource/Kconfig. This allows the configuration to be shared across different architectures. Update the selection to include support for ARCH_S32 and add a "None" option restricted to ARCH_S32, since Vybrid lacks the ARM Architected Timer. The Vybrid Global Timer option is restricted to ARCH_MULTI_V7 SOC_VF610 platforms to prevent it from being visible on Cortex-M4 builds, which lack the ARM Global Timer hardware. Fixes: bee33f22d7c3 ("clocksource/drivers/nxp-pit: Add NXP Automotive s32g2= / s32g3 support") Signed-off-by: Enric Balletbo i Serra Signed-off-by: Daniel Lezcano Reviewed-by: Frank Li Link: https://patch.msgid.link/20260514-fix-nxp-timer-v3-1-a3e68fdb505e@red= hat.com --- arch/arm/mach-imx/Kconfig | 21 --------------------- drivers/clocksource/Kconfig | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 6ea1bd5..a361840 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -227,27 +227,6 @@ config SOC_VF610 help This enables support for Freescale Vybrid VF610 processor. =20 -choice - prompt "Clocksource for scheduler clock" - depends on SOC_VF610 - default VF_USE_ARM_GLOBAL_TIMER - - config VF_USE_ARM_GLOBAL_TIMER - bool "Use ARM Global Timer" - depends on ARCH_MULTI_V7 - select ARM_GLOBAL_TIMER - select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK - help - Use the ARM Global Timer as clocksource - - config VF_USE_PIT_TIMER - bool "Use PIT timer" - select NXP_PIT_TIMER - help - Use SoC Periodic Interrupt Timer (PIT) as clocksource - -endchoice - endif =20 endif diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index d1a33a2..d9c76dd 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -793,4 +793,35 @@ config RTK_SYSTIMER this option only when building for a Realtek platform or for compilation testing. =20 +choice + prompt "NXP clocksource for scheduler clock" + depends on SOC_VF610 || ARCH_S32 + # Default to Global Timer for Vybrid (32-bit) + default VF_USE_ARM_GLOBAL_TIMER if SOC_VF610 + # Default to None for S32 (64-bit) + default VF_TIMER_NONE if ARCH_S32 + + config VF_USE_ARM_GLOBAL_TIMER + bool "Use NXP Vybrid Global Timer" + depends on ARCH_MULTI_V7 && SOC_VF610 + select ARM_GLOBAL_TIMER + select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK + help + Use the NXP Vybrid Global Timer as clocksource. + + config VF_USE_PIT_TIMER + bool "Use NXP PIT timer" + select NXP_PIT_TIMER + help + Use NXP Periodic Interrupt Timer (PIT) as clocksource. + + config VF_TIMER_NONE + bool "None (Use standard Arch Timer)" + depends on ARCH_S32 + help + Do not use any specific NXP timer driver. Use the standard + ARM Architected Timer instead. + +endchoice + endmenu