From patchwork Fri Sep 6 10:34:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuan Liu via B4 Relay X-Patchwork-Id: 13793898 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 2CA291C870E; Fri, 6 Sep 2024 10:34:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725618898; cv=none; b=sTK+q+vy25zTRza9COIpUPyryxnZh+f4uY3c3KRiWxyQ1EUscG54OTldvNU9Kawy0SSGDtasXc0eZeXp83SMcqth7uF1DRW3Trn4CNhiDnsFeZ/nkM/Bh57h0VprJ0NPojkv4ee0gY8ZWlhkSdyxF/YNzdK+AlO+P0zcrMD0He4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725618898; c=relaxed/simple; bh=Q5Nu6ki00BNEPUpMCqJOMGrigpdjNMijiEiU0fOJHMs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RfIxbYg8ns5dov1cdqR2omXjHto1Ig2DchIdw21pt7naXPrWoJV11oB7RponXNP/yhKK05mCt+j1H0HpYX/zikisMaTs641eAKeBWZnjA3fyGtIYcA2E0hT3qoMjcF6OK1DO6pY68JVx1Vxmnd56Qhec7Yo5I6agEMdLF8irQA0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=feLd2oA2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="feLd2oA2" Received: by smtp.kernel.org (Postfix) with ESMTPS id 00445C4CEC5; Fri, 6 Sep 2024 10:34:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725618898; bh=Q5Nu6ki00BNEPUpMCqJOMGrigpdjNMijiEiU0fOJHMs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=feLd2oA2h1fpNCwu7OpYQg6Jto2lrd2wkK8rIboKdt5MEPbWf8DvzVpLyDlb2+JF1 xS81og+9ExOQU8Hiy7c4cpSGLIrljE3hzX6juND7ZQxvH2qX+R5JHsIocdeokZ8PjG 5KC83NKiI617ls/Ki73IxaFbL0byLlalpjCAqdaasuJh1CjMTtGYOUWTyIyE0PJyFy Yz6KFOaNMOTNAOq9rWnTahxmQRquAGsADK7WmHG8y1XcKSXfIgtV2FvkIirhJggiwY r8u+g4skA+DftSPhHlfORbz78/eGGezkuaOtfioeoBvW5ekwCYwG2E4oZ168wmgiSt KE6zIpKX+G5iQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E02A6CE7AFD; Fri, 6 Sep 2024 10:34:57 +0000 (UTC) From: Chuan Liu via B4 Relay Date: Fri, 06 Sep 2024 18:34:40 +0800 Subject: [PATCH v2 1/3] clk: meson: Support PLL with fixed fractional denominators Precedence: bulk X-Mailing-List: linux-clk@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240906-fix_clk-v2-1-7a3941eb2cdf@amlogic.com> References: <20240906-fix_clk-v2-0-7a3941eb2cdf@amlogic.com> In-Reply-To: <20240906-fix_clk-v2-0-7a3941eb2cdf@amlogic.com> To: Neil Armstrong , Jerome Brunet , Michael Turquette , Stephen Boyd , Kevin Hilman , Martin Blumenstingl Cc: linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Chuan Liu X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1725618896; l=1859; i=chuan.liu@amlogic.com; s=20240902; h=from:subject:message-id; bh=sWmncD36tYvYasLV2agsUM1OmEI/Pbp0y7H5RQI6gyA=; b=4/xHBnoby8jx3W1+dFt1CO/FshqhvP3WwGUal1rMsRXHWSq+LWZPSvMSKC2/icWrRMR/HUXnO PsJNpbDCIRdClPh2zEqrnCf1n7wS7rEGGn5JB6cxFetc3LLQkMSdhul X-Developer-Key: i=chuan.liu@amlogic.com; a=ed25519; pk=fnKDB+81SoWGKW2GJNFkKy/ULvsDmJZRGBE7pR5Xcpo= X-Endpoint-Received: by B4 Relay for chuan.liu@amlogic.com/20240902 with auth_id=203 X-Original-From: Chuan Liu Reply-To: chuan.liu@amlogic.com From: Chuan Liu Some PLLS with fractional multipliers have fractional denominators with fixed values, instead of the previous "(1 << pll-> frc.width)". Signed-off-by: Chuan Liu --- drivers/clk/meson/clk-pll.c | 8 +++++--- drivers/clk/meson/clk-pll.h | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/clk/meson/clk-pll.c b/drivers/clk/meson/clk-pll.c index bc570a2ff3a3..a141ab450009 100644 --- a/drivers/clk/meson/clk-pll.c +++ b/drivers/clk/meson/clk-pll.c @@ -57,12 +57,13 @@ static unsigned long __pll_params_to_rate(unsigned long parent_rate, struct meson_clk_pll_data *pll) { u64 rate = (u64)parent_rate * m; + unsigned int frac_max = unlikely(pll->frac_max) ? pll->frac_max : + (1 << pll->frac.width); if (frac && MESON_PARM_APPLICABLE(&pll->frac)) { u64 frac_rate = (u64)parent_rate * frac; - rate += DIV_ROUND_UP_ULL(frac_rate, - (1 << pll->frac.width)); + rate += DIV_ROUND_UP_ULL(frac_rate, frac_max); } return DIV_ROUND_UP_ULL(rate, n); @@ -100,7 +101,8 @@ static unsigned int __pll_params_with_frac(unsigned long rate, unsigned int n, struct meson_clk_pll_data *pll) { - unsigned int frac_max = (1 << pll->frac.width); + unsigned int frac_max = unlikely(pll->frac_max) ? pll->frac_max : + (1 << pll->frac.width); u64 val = (u64)rate * n; /* Bail out if we are already over the requested rate */ diff --git a/drivers/clk/meson/clk-pll.h b/drivers/clk/meson/clk-pll.h index 7b6b87274073..949157fb7bf5 100644 --- a/drivers/clk/meson/clk-pll.h +++ b/drivers/clk/meson/clk-pll.h @@ -43,6 +43,7 @@ struct meson_clk_pll_data { unsigned int init_count; const struct pll_params_table *table; const struct pll_mult_range *range; + unsigned int frac_max; u8 flags; }; From patchwork Fri Sep 6 10:34:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuan Liu via B4 Relay X-Patchwork-Id: 13793901 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 784A21C9EB7; Fri, 6 Sep 2024 10:34:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725618898; cv=none; b=imwqlrtqebVjgTx9O/PF5x85y+ygF1uTMv25FmeOgpl3ieQsRWrRKkC86UlzGZrldp8Wb/wVCtFSmp7ikOWuE4D8MTczpxkmGrXB09qXHyAqyPB/+HlJZvitioJpW+Xnxme0bn6hkKve0Mzydhin7fKTVcu3Uy6EBHkojb9bipg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725618898; c=relaxed/simple; bh=wNROTOGwTrtcI0H20f0EmINCmCNdwFiZLjQMJFcLHU0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=A+QK2OmJFN5jIGHYWPX0f1ion6SIXPVL8NHEuxHDYpzqlCboSAuNGDCek1SaC6gj6NrRwWyj0khDh77XQ3pusH3Dvu5cCEpARzQ/7Px1uqNyJtaiRb2X97GEhz7OI6COHr2mvRjiosw9Dd+ZKwbzi/Eu2Wu9yPoFvZEYnR9QVaI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Z6FSWxuR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Z6FSWxuR" Received: by smtp.kernel.org (Postfix) with ESMTPS id 11535C4CEC8; Fri, 6 Sep 2024 10:34:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725618898; bh=wNROTOGwTrtcI0H20f0EmINCmCNdwFiZLjQMJFcLHU0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=Z6FSWxuRSTKe/x3nQ8Q3ngcRLUR2Bmr427Sp2jclLnw+S7ttvc0dj5WuTu6vdwyZZ Vc08i8ggquZSgUuH45nHbIbuW6ywtNjzKx/kbyNWyHFbJP9vS+sTyddN8DL1h3GxZ3 OI8uwI4W9LwaNVTpCm8262abAHdj/iUUzBmSEKbY2I5qqKbtUQ/PGxrHtXK8YK9ELk LN7CisCV1g4lZnzHnCQ5z9DBVS741Qd6hjQZU7TRwrGUHkZQHMZWg7xUTCHE6ffDoj 0ELoME1wn29+lHK6llxnq1x7u/5iNbfby9Fb2Aag5Ffa6WWqAlwWHIGB7n4/oLDN8i S4G71bwzPMJXg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 024A6CE7AFE; Fri, 6 Sep 2024 10:34:58 +0000 (UTC) From: Chuan Liu via B4 Relay Date: Fri, 06 Sep 2024 18:34:41 +0800 Subject: [PATCH v2 2/3] clk: meson: c3: pll: fix frac maximum value for hifi_pll Precedence: bulk X-Mailing-List: linux-clk@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240906-fix_clk-v2-2-7a3941eb2cdf@amlogic.com> References: <20240906-fix_clk-v2-0-7a3941eb2cdf@amlogic.com> In-Reply-To: <20240906-fix_clk-v2-0-7a3941eb2cdf@amlogic.com> To: Neil Armstrong , Jerome Brunet , Michael Turquette , Stephen Boyd , Kevin Hilman , Martin Blumenstingl Cc: linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Chuan Liu X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1725618896; l=770; i=chuan.liu@amlogic.com; s=20240902; h=from:subject:message-id; bh=I33Vhd+oqJKtNl4x++Y8xPKvaKodnZowE3DBu//z/PA=; b=SADKBH0Q0M4WKvE3kt3/P9oBlUQyRQdTGwUXOIBOYeC1DM1J+oIsLeZanYu9JVZEUNfkwxyeO LKUG7LOZoIMBf9/qE6ZBzEJkfCtwZ+SCdrrj54fGqYCVjdoC0hTkw2F X-Developer-Key: i=chuan.liu@amlogic.com; a=ed25519; pk=fnKDB+81SoWGKW2GJNFkKy/ULvsDmJZRGBE7pR5Xcpo= X-Endpoint-Received: by B4 Relay for chuan.liu@amlogic.com/20240902 with auth_id=203 X-Original-From: Chuan Liu Reply-To: chuan.liu@amlogic.com From: Chuan Liu The fractional denominator of C3's hifi_pll fractional multiplier is fixed to 100000. Fixes: 8a9a129dc565 ("clk: meson: c3: add support for the C3 SoC PLL clock") Signed-off-by: Chuan Liu --- drivers/clk/meson/c3-pll.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/clk/meson/c3-pll.c b/drivers/clk/meson/c3-pll.c index 32bd2ed9d304..35fda31a19e2 100644 --- a/drivers/clk/meson/c3-pll.c +++ b/drivers/clk/meson/c3-pll.c @@ -361,6 +361,7 @@ static struct clk_regmap hifi_pll_dco = { .range = &c3_gp0_pll_mult_range, .init_regs = c3_hifi_init_regs, .init_count = ARRAY_SIZE(c3_hifi_init_regs), + .frac_max = 100000, }, .hw.init = &(struct clk_init_data) { .name = "hifi_pll_dco", From patchwork Fri Sep 6 10:34:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuan Liu via B4 Relay X-Patchwork-Id: 13793900 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 784571C9EB6; Fri, 6 Sep 2024 10:34:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725618898; cv=none; b=odKdPmVj4bh4L121MpqW4cxN6TIWzBEHXhTScT7rzfx5ftf5SCJS2gixE2IRJu9xOdz/nb6ax2aWTNem4fcHg25qtMkNWSY1ocwFDDEaF84ikKa84J+LGPOKjgtD8yVfYXEqEL4indoZBJ+Y8VFDuTEA47s+UpEJZOxeZYem6qw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725618898; c=relaxed/simple; bh=uCQdKOYsTP4hrdyMRlGaCSGI01VPRdBPeBN372SaHDQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=n2zblbOi5sqvADi7lYIGRDQ4JVJgKh4DL85czWg+VRP9TTI3LS4ftE7jo6IhZlO7P+nDQ6kViL8NLG1+YcUqsROyoxyvXQf6/2cfS9Z2TZKJUQU2WUdGbpXUWKGvRljCtu3mw9FevbNkOZOHj1GyxtjebM5k68R/gwCxDt94QZU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hCC7ONT/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hCC7ONT/" Received: by smtp.kernel.org (Postfix) with ESMTPS id 20D86C4CECC; Fri, 6 Sep 2024 10:34:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725618898; bh=uCQdKOYsTP4hrdyMRlGaCSGI01VPRdBPeBN372SaHDQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=hCC7ONT/cma4aU4Z+r81N9RKtxKkYiwnLLzscmNvctmk6zKdwO5veqtwaJfrH6tGL rX3BAgm1wS+ptOGNdEucxbMgzafuu+ZwE6ArALAFYpXVL2qnD1oqB4FsHFkwOKCd6H 3d89x0ihJso6L7UdL537YUJDILXENHayvC2n5SwL92huhMU0F9gXyIJ9HRFrVIUUru O+yz3469o2aOf7/7oMjjxP0F7W/aGC3HMeWR2btV9WkVkRJSSZvK5qE6SD/Qo4evm6 +48d/CSoragLY6ILimAndiWNIgEAtiHqexOmqswOTYdoWK9w8whsg8lJZQuT5OpXHH c1gOCnSIU9xzg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16738CE7AFB; Fri, 6 Sep 2024 10:34:58 +0000 (UTC) From: Chuan Liu via B4 Relay Date: Fri, 06 Sep 2024 18:34:42 +0800 Subject: [PATCH v2 3/3] clk: meson: s4: pll: fix frac maximum value for hifi_pll Precedence: bulk X-Mailing-List: linux-clk@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240906-fix_clk-v2-3-7a3941eb2cdf@amlogic.com> References: <20240906-fix_clk-v2-0-7a3941eb2cdf@amlogic.com> In-Reply-To: <20240906-fix_clk-v2-0-7a3941eb2cdf@amlogic.com> To: Neil Armstrong , Jerome Brunet , Michael Turquette , Stephen Boyd , Kevin Hilman , Martin Blumenstingl Cc: linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Chuan Liu X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1725618896; l=793; i=chuan.liu@amlogic.com; s=20240902; h=from:subject:message-id; bh=0Clx6bfIj6hxSYsk/ARky+mR6oBy1RRrZhsjk6VQ2QA=; b=ThDaSqaw71UK6w/lWibNMR0YeJltaOgEuPPvwpd+6M1NwIFlx1gS3eMXr41yBZug7ojGK0sGw EBsrcnT4InBBrsES6cADjt0jMtjpw4fJjYCzE5zDZzNdk8sEla4Wvfn X-Developer-Key: i=chuan.liu@amlogic.com; a=ed25519; pk=fnKDB+81SoWGKW2GJNFkKy/ULvsDmJZRGBE7pR5Xcpo= X-Endpoint-Received: by B4 Relay for chuan.liu@amlogic.com/20240902 with auth_id=203 X-Original-From: Chuan Liu Reply-To: chuan.liu@amlogic.com From: Chuan Liu The fractional denominator of S4's hifi_pll fractional multiplier is fixed to 100000. Fixes: 80344f4c1a1e ("clk: meson: s4: pll: hifi_pll support fractional multiplier") Signed-off-by: Chuan Liu --- drivers/clk/meson/s4-pll.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/clk/meson/s4-pll.c b/drivers/clk/meson/s4-pll.c index a97e19057b05..9697f6577e06 100644 --- a/drivers/clk/meson/s4-pll.c +++ b/drivers/clk/meson/s4-pll.c @@ -371,6 +371,7 @@ static struct clk_regmap s4_hifi_pll_dco = { .range = &s4_gp0_pll_mult_range, .init_regs = s4_hifi_init_regs, .init_count = ARRAY_SIZE(s4_hifi_init_regs), + .frac_max = 100000, .flags = CLK_MESON_PLL_ROUND_CLOSEST, }, .hw.init = &(struct clk_init_data){