From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794590760; b=d8U2D8KYLZHAVRr/3JGEoBq4q6zQFd27dODEgPYkxEsoBOC+Zem3yW8yp72k76Ldegcm xz214X7rkR7oVTJ+k3iLCBEA7JSAhV+GtS7+fyjocXjBLdjFOgFXVYcvjuVmDOZ3lVevh w6makWrehb3Mtm2kneQKqHcVk+MmEqV2+agdeAdpSAdaKnRCIa+aBVLc7iK6SNzeyWLLn 6FNaBpuVu7qtLowOeI/ZyDPdQGigTa+STcMLnTdbac1ah/0lBkRMI6F3xANsCWf74jqHo Fkf2F+/ruyw2Wx8/M8R91+EpQOOfG/Mj2vCS58Tlosh7GkyxLjR/4FmXT+68IREf5Pw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794590760; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=UKB4kCO99b5BZWLbBmP5hV/gcQ4IxXqkugJxdCIf6Bg=; b=QAIFW0+sMfOQ7OtXur1okZRxOnUj2JJ/Xi9B433gfCDAywpPTfU+61s1p33rHGLTqJIr lllbZ7NB8bGLhgclfgEXJl9m5fKzTXYuqi1Yl61EXg/vJwMqszI3X8a/cW1q+jqmcUv4T Tc4yFJtLSThtBjYis5d3/oQgQdmGtA/fk8UnMWxXKmBH7bLTcDPuuuBo1ElCVnL4JLTxf x0Bb+15zj1gOInwePr8N8O3g+Qxi25gDCA4l7V/CgK39LKREvizbUDx7jN/o99uuQqUdl PS9PMQBy0WazDZSngsTe7dhofPf2E2Zp87WRVmINGYNVx8uQodEqYIZovsnjRLUt42g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=awGY33t5; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EFFC2607C355; Fri, 13 Nov 2026 17:25:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=awGY33t5 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B1391F000C4; Fri, 13 Nov 2026 17:25:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794590759; bh=UKB4kCO99b5BZWLbBmP5hV/gcQ4IxXqkugJxdCIf6Bg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=awGY33t5rzmWSJ2z0Ja3PC5gHMTyO9vlDZBI4Uia4ifk0dl+U58/fW3NonF35gUmP oRRRpk2BTbXXmJFqG2DfAeLTRIcTkgfEprY0Is6btE7eArI1+dE8f2stbH5NC5WplX FGTF2ySLTSPdAJqNHPAkIGwujkAZ3gB/FerEIhOs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Miquel Raynal , Jerome Brunet , Brian Masney , Sasha Levin Subject: [PATCH 6.18 660/686] clk: nuvoton: ma35d1: Keep the clock count in the driver Date: Fri, 13 Nov 2026 10:53:13 -0500 Message-ID: <20261113153844.087438427@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261113153820.902362109@linuxfoundation.org> References: <20261113153820.902362109@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Miquel Raynal [ Upstream commit 26ec588063d9b6c70773b8729372e2bf6d3ea95a ] The number of clocks is not a binding since this is a value that can change. As such, in order to support the missing watchdog clocks and allow the deprecation and removal of CLK_MAX_IDX from the bindings, we need to switch to a local definition first. Signed-off-by: Miquel Raynal Link: https://patch.msgid.link/20260930-perso-ma35d1-upstream-clk-v6-1-48937ee6c9bb@bootlin.com Signed-off-by: Jerome Brunet Signed-off-by: Brian Masney Stable-dep-of: 1dc3871ce7ec ("clk: nuvoton: ma35d1: Add missing WDT/WWDT parent clocks") Signed-off-by: Sasha Levin --- drivers/clk/nuvoton/clk-ma35d1.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/clk/nuvoton/clk-ma35d1.c b/drivers/clk/nuvoton/clk-ma35d1.c index 9f65d0623517a..6aa42a3e1be3b 100644 --- a/drivers/clk/nuvoton/clk-ma35d1.c +++ b/drivers/clk/nuvoton/clk-ma35d1.c @@ -17,6 +17,7 @@ static DEFINE_SPINLOCK(ma35d1_lock); #define PLL_MAX_NUM 5 +#define MA35D1_CLK_COUNT 236 /* Clock Control Registers Offset */ #define REG_CLK_PWRCTL 0x00 @@ -467,12 +468,12 @@ static int ma35d1_clocks_probe(struct platform_device *pdev) int ret; ma35d1_hw_data = devm_kzalloc(dev, - struct_size(ma35d1_hw_data, hws, CLK_MAX_IDX), + struct_size(ma35d1_hw_data, hws, MA35D1_CLK_COUNT), GFP_KERNEL); if (!ma35d1_hw_data) return -ENOMEM; - ma35d1_hw_data->num = CLK_MAX_IDX; + ma35d1_hw_data->num = MA35D1_CLK_COUNT; hws = ma35d1_hw_data->hws; clk_base = devm_platform_ioremap_resource(pdev, 0); -- 2.53.0