From patchwork Mon Sep 9 10:08:56 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: 13796596 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 B58DD1B3B2B; Mon, 9 Sep 2024 10:09:17 +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=1725876557; cv=none; b=FU95KNXskkcnT6yFNnm5uKLDBkIOqrSLVQlFaeBJSyPO7O56VNZlF4KSQP8rO3hBHEAJZ1TqBW2F1/L9qkJoappdHt3uPkirnkGZUM0/v+RjbznEs7YKNFOBYspJDV3Xl6VwEepE9L03wf2Xz0NXsSQPqypUUQZ7I2XRFeFVHnw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725876557; c=relaxed/simple; bh=RkUWT/0arfso8PoZuHXKVk1Cw40RK964zYOKCHpr3nE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=c6M83fFjRWqTudDhpzsrs8OqwuWKyRdVD19jbWINdcONfI3IlRjPICAw/4k+zmURjxapg2T4M9UcpHvZsezE0o77OvpWXSZK8jHG6O41bpQ6jxKitBL/h8+Mlst8Wk8Ty8nDMEs2d1pGJx4GRvTujJMq7fTlTO17oX9Al3GJGRY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EHnOH4k4; 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="EHnOH4k4" Received: by smtp.kernel.org (Postfix) with ESMTPS id 61337C4CEC8; Mon, 9 Sep 2024 10:09:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725876557; bh=RkUWT/0arfso8PoZuHXKVk1Cw40RK964zYOKCHpr3nE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=EHnOH4k4ZdZj7SxH1Niavu5KXKFCh02h94MH3UcaYiXKHUSywi84ReEY4czfIYVQh 47f0B75OGH6xPtcZg6LZUAXE6XCpDPxhk9r2VuCsLLrDYhkz3zo5ifi7v5/2el0mjr SLA8fzJPRQPc+c89YHZMLI+3TF5MyxkHARsIW5YeHw3aTef8j1X5nxeBhct5cwZFUZ /iS1HgcxR4n0+GDYvx1evlvud5OnTjghoJC1iHQ+SiLNZ0swsTIOZOOglk83JefK2T WiMkwoUiinSFlF4DHZybJevCq/PwZj9yng7rzp5QS9AVmyaFB4jHWTjfabAZklkdUB CZNCIcaKZzVQA== 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 4EB12ECE579; Mon, 9 Sep 2024 10:09:17 +0000 (UTC) From: Chuan Liu via B4 Relay Date: Mon, 09 Sep 2024 18:08:56 +0800 Subject: [PATCH v3 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: <20240909-fix_clk-v3-1-a6d8f6333c04@amlogic.com> References: <20240909-fix_clk-v3-0-a6d8f6333c04@amlogic.com> In-Reply-To: <20240909-fix_clk-v3-0-a6d8f6333c04@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=1725876555; l=1833; i=chuan.liu@amlogic.com; s=20240902; h=from:subject:message-id; bh=tm+eqZ6z2/fu+O9mUT6fjnN7chLjmdHoODAhOfI/R44=; b=U11cPwwTOmhBwh26n/Uf/6HYS90n2Yjr6nBrNusbctnjBVmkncO4x1YgCC6W4bb8CpHU6PAXJ FDIVkNCLdYHAyfiGCt9F3/9ZnyZv7DL6hWUl2tTSf0Oti+fqY3IWf+I 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..89f0f04a16ab 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 = 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 = 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 Mon Sep 9 10:08:57 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: 13796595 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 90316DF58; Mon, 9 Sep 2024 10:09:17 +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=1725876557; cv=none; b=FbW93uh/sjc8WVzDc4d8OFr6oFHjT6yc69+R7FUXe8z+Bjqw8txOmtEJTq07jcEZcIB3E3ZsJTvXkzVB3Sw5hbUm4zXfql7SWcwyrsz9E/j2RopX/K8TyDCpNe0j3tCVaMMMobdSrKiD1VHNijFdwlBfF00RVUoyVS0urS9T+84= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725876557; c=relaxed/simple; bh=wNROTOGwTrtcI0H20f0EmINCmCNdwFiZLjQMJFcLHU0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HfXMH4X2+C7tjhXYaKhNHXG4umqn4LejkpMHvbXixfWombaWeBBjJP0g6i39JZnMycVqLmoZh1peHFrM+b0P+qIygMp+mfatRVHxv+4bMBe/n0mai8x3cCb+Daynp6mbuS6h+foIleXLldhQrjHudhd6+pCvQUr1CifWKQCG12k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gpiYI1LE; 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="gpiYI1LE" Received: by smtp.kernel.org (Postfix) with ESMTPS id 6A638C4CECB; Mon, 9 Sep 2024 10:09:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725876557; bh=wNROTOGwTrtcI0H20f0EmINCmCNdwFiZLjQMJFcLHU0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=gpiYI1LEY/2NHjn7vKGGHqTn5IIYP40L/Emxy8Ltkz1ktpF9M83Xausz4RkMPJ3nk 7wm/RhYdoooo4Uposni120xm+xloKvICJbyJ3IOVzixIvtbe2LKRKOnK3o9/VVTHFX cFZKliUsKLg/q5aSHymagdVrWm70X6btCPpbm9LrkhXJmlzqQHmvCV3JWt5twrpyCh 8JrgcFM7DTgo8y++L3LP0cIlYTNVFVp7ErJvXODUMPHrVggdeC6BPsxm0N0hCQgqqM SJ71RUlfjPFw5sEMpy2QorM+NUxjBZaXBtrfNrjOCniWW3DXjG9Ewwm3freOhHdcsv qjWRQNgnKfXEQ== 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 5AE36ECE57A; Mon, 9 Sep 2024 10:09:17 +0000 (UTC) From: Chuan Liu via B4 Relay Date: Mon, 09 Sep 2024 18:08:57 +0800 Subject: [PATCH v3 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: <20240909-fix_clk-v3-2-a6d8f6333c04@amlogic.com> References: <20240909-fix_clk-v3-0-a6d8f6333c04@amlogic.com> In-Reply-To: <20240909-fix_clk-v3-0-a6d8f6333c04@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=1725876555; l=770; i=chuan.liu@amlogic.com; s=20240902; h=from:subject:message-id; bh=I33Vhd+oqJKtNl4x++Y8xPKvaKodnZowE3DBu//z/PA=; b=sUDSMpQF9WTheM2ifxOy7eEX8CY4oBwIkOs0u9IEtYYRpSvEcQ5GG9sxdrCKUWqGbm9QBL96f zfj8XzUBaAOC1ifMGVa+iIc+WFvmq83fhWx6zjlCWHOclqLVsF5v7WT 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 Mon Sep 9 10:08:58 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: 13796598 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 E4BE21B3F12; Mon, 9 Sep 2024 10:09:17 +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=1725876558; cv=none; b=XFmCKFCpU8fr2UAEMNRyJGrA57pUYm+VdwAbQPxmyOsv1Q/lhnsnVHB1SNmC5n9mbm7Rm5vzk3miOjAlGMIu7GHcr4emjbhG2MBHiGZhYzfhP5OVqcfILFzIL/OYx7QkOfnfyj3JhhddLh92Vnq2ww6/vPTtgBigBVEVqHrrW50= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725876558; c=relaxed/simple; bh=uCQdKOYsTP4hrdyMRlGaCSGI01VPRdBPeBN372SaHDQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EGkZ9JGACnbDpMo+dt5K7jbcCyIs/ePD7MOADD4rTM3BJgCfoZOfA90F4Es2Zrv5LJutUdh+Epafx+HDDfS16QzjZGWDREKEm0kdbvPxRANhvYx6nv+1VMbgXA9rogjWlOhSihTBKCSWA2+5XUmQLefxBfA/wzMmdT0OPSlvQm0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PxQNulY8; 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="PxQNulY8" Received: by smtp.kernel.org (Postfix) with ESMTPS id 754F1C4CECC; Mon, 9 Sep 2024 10:09:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725876557; bh=uCQdKOYsTP4hrdyMRlGaCSGI01VPRdBPeBN372SaHDQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=PxQNulY87u5/JVzGFlANjQm8D2poWanBScahXoiT27qgfOSZJACpHGAKBue0+w106 4bjqgF5BjlV+hBr7D1a8vUjB5I2azY+QXIoT/hLJtFkutf5Qb2lRJT4KfiW2JKhCLY Rri+qgrEymZw3p9Sdtt9qJK4RXI39CwQKAkrdfZKF5P5E/ysSGC1swIFqBwmgfG0pG 6uQ3NbcnaeEhN0Go1fhycNqQMx4em+pr3AdPY4YcbU3hbPAw8CtdgBqs9tdEBkVg60 szsJB+W7ocdADklMsXVdCzUDnQ6fI3flmLP+TqyXxbhq4asqNqQ2HPMenrBhxTDJMa cEvKwA1aNWOOw== 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 67BFAECE584; Mon, 9 Sep 2024 10:09:17 +0000 (UTC) From: Chuan Liu via B4 Relay Date: Mon, 09 Sep 2024 18:08:58 +0800 Subject: [PATCH v3 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: <20240909-fix_clk-v3-3-a6d8f6333c04@amlogic.com> References: <20240909-fix_clk-v3-0-a6d8f6333c04@amlogic.com> In-Reply-To: <20240909-fix_clk-v3-0-a6d8f6333c04@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=1725876555; l=793; i=chuan.liu@amlogic.com; s=20240902; h=from:subject:message-id; bh=0Clx6bfIj6hxSYsk/ARky+mR6oBy1RRrZhsjk6VQ2QA=; b=kW8tt0TPN5U0gdUFRbA8YWbIIehLdHdhtzws/z4AezrasCh7v4VlykiQ5tI84OkY62bcGPxlT z/4cFfsxf5RDwcO6cTBms1LwgLJBDWjner2BfweVSBII5r+prmbwmco 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){