From: Haylen Chu <heylenay@4d2.org>
To: Troy Mitchell <troy.mitchell@linux.spacemit.com>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>, Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>, Yixun Lan <dlan@gentoo.org>,
Alex Elder <elder@riscstar.com>,
Inochi Amaoto <inochiama@outlook.com>
Cc: linux-clk@vger.kernel.org, devicetree@vger.kernel.org,
linux-riscv@lists.infradead.org, spacemit@lists.linux.dev,
linux-kernel@vger.kernel.org,
Jinmei Wei <weijinmei@linux.spacemit.com>
Subject: Re: [PATCH v3 2/3] clk: spacemit: introduce pre-div for ddn clock
Date: Mon, 18 Aug 2025 09:49:10 +0000 [thread overview]
Message-ID: <aKL3FghKPUaQcagM@ketchup> (raw)
In-Reply-To: <20250818-k1-clk-i2s-generation-v3-2-8139b22ae709@linux.spacemit.com>
On Mon, Aug 18, 2025 at 05:28:21PM +0800, Troy Mitchell wrote:
> The original DDN operations applied an implicit divide-by-2, which should
> not be a default behavior.
>
> This patch removes that assumption, letting each clock define its
> actual behavior explicitly.
>
> Signed-off-by: Troy Mitchell <troy.mitchell@linux.spacemit.com>
> ---
> drivers/clk/spacemit/ccu-k1.c | 4 ++--
> drivers/clk/spacemit/ccu_ddn.c | 12 ++++++------
> drivers/clk/spacemit/ccu_ddn.h | 6 ++++--
> 3 files changed, 12 insertions(+), 10 deletions(-)
Reviewed-by: Haylen Chu <heylenay@4d2.org>
> diff --git a/drivers/clk/spacemit/ccu-k1.c b/drivers/clk/spacemit/ccu-k1.c
> index 65e6de030717afa60eefab7bda88f9a13b857650..7155824673fb450971439873b6b6163faf48c7e5 100644
> --- a/drivers/clk/spacemit/ccu-k1.c
> +++ b/drivers/clk/spacemit/ccu-k1.c
> @@ -136,8 +136,8 @@ CCU_GATE_DEFINE(pll1_d3_819p2, CCU_PARENT_HW(pll1_d3), MPMU_ACGR, BIT(14), 0);
> CCU_GATE_DEFINE(pll1_d2_1228p8, CCU_PARENT_HW(pll1_d2), MPMU_ACGR, BIT(16), 0);
>
> CCU_GATE_DEFINE(slow_uart, CCU_PARENT_NAME(osc), MPMU_ACGR, BIT(1), CLK_IGNORE_UNUSED);
> -CCU_DDN_DEFINE(slow_uart1_14p74, pll1_d16_153p6, MPMU_SUCCR, 16, 13, 0, 13, 0);
> -CCU_DDN_DEFINE(slow_uart2_48, pll1_d4_614p4, MPMU_SUCCR_1, 16, 13, 0, 13, 0);
> +CCU_DDN_DEFINE(slow_uart1_14p74, pll1_d16_153p6, MPMU_SUCCR, 16, 13, 0, 13, 2, 0);
> +CCU_DDN_DEFINE(slow_uart2_48, pll1_d4_614p4, MPMU_SUCCR_1, 16, 13, 0, 13, 2, 0);
>
> CCU_GATE_DEFINE(wdt_clk, CCU_PARENT_HW(pll1_d96_25p6), MPMU_WDTPCR, BIT(1), 0);
>
> diff --git a/drivers/clk/spacemit/ccu_ddn.c b/drivers/clk/spacemit/ccu_ddn.c
> index be311b045698e95a688a35858a8ac1bcfbffd2c7..06d86748182bd1959cdab5c18d0a882ee25dcade 100644
> --- a/drivers/clk/spacemit/ccu_ddn.c
> +++ b/drivers/clk/spacemit/ccu_ddn.c
> @@ -22,21 +22,21 @@
>
> #include "ccu_ddn.h"
>
> -static unsigned long ccu_ddn_calc_rate(unsigned long prate,
> - unsigned long num, unsigned long den)
> +static unsigned long ccu_ddn_calc_rate(unsigned long prate, unsigned long num,
> + unsigned long den, unsigned int pre_div)
> {
> - return prate * den / 2 / num;
> + return prate * den / pre_div / num;
> }
>
> static unsigned long ccu_ddn_calc_best_rate(struct ccu_ddn *ddn,
> unsigned long rate, unsigned long prate,
> unsigned long *num, unsigned long *den)
> {
> - rational_best_approximation(rate, prate / 2,
> + rational_best_approximation(rate, prate / ddn->pre_div,
> ddn->den_mask >> ddn->den_shift,
> ddn->num_mask >> ddn->num_shift,
> den, num);
> - return ccu_ddn_calc_rate(prate, *num, *den);
> + return ccu_ddn_calc_rate(prate, *num, *den, ddn->pre_div);
> }
>
> static long ccu_ddn_round_rate(struct clk_hw *hw, unsigned long rate,
> @@ -58,7 +58,7 @@ static unsigned long ccu_ddn_recalc_rate(struct clk_hw *hw, unsigned long prate)
> num = (val & ddn->num_mask) >> ddn->num_shift;
> den = (val & ddn->den_mask) >> ddn->den_shift;
>
> - return ccu_ddn_calc_rate(prate, num, den);
> + return ccu_ddn_calc_rate(prate, num, den, ddn->pre_div);
> }
>
> static int ccu_ddn_set_rate(struct clk_hw *hw, unsigned long rate,
> diff --git a/drivers/clk/spacemit/ccu_ddn.h b/drivers/clk/spacemit/ccu_ddn.h
> index a52fabe77d62eba16426867a9c13481e72f025c0..4838414a8e8dc04af49d3b8d39280efedbd75616 100644
> --- a/drivers/clk/spacemit/ccu_ddn.h
> +++ b/drivers/clk/spacemit/ccu_ddn.h
> @@ -18,13 +18,14 @@ struct ccu_ddn {
> unsigned int num_shift;
> unsigned int den_mask;
> unsigned int den_shift;
> + unsigned int pre_div;
> };
>
> #define CCU_DDN_INIT(_name, _parent, _flags) \
> CLK_HW_INIT_HW(#_name, &_parent.common.hw, &spacemit_ccu_ddn_ops, _flags)
>
> #define CCU_DDN_DEFINE(_name, _parent, _reg_ctrl, _num_shift, _num_width, \
> - _den_shift, _den_width, _flags) \
> + _den_shift, _den_width, _pre_div, _flags) \
> static struct ccu_ddn _name = { \
> .common = { \
> .reg_ctrl = _reg_ctrl, \
> @@ -33,7 +34,8 @@ static struct ccu_ddn _name = { \
> .num_mask = GENMASK(_num_shift + _num_width - 1, _num_shift), \
> .num_shift = _num_shift, \
> .den_mask = GENMASK(_den_shift + _den_width - 1, _den_shift), \
> - .den_shift = _den_shift, \
> + .den_shift = _den_shift, \
> + .pre_div = _pre_div, \
> }
>
> static inline struct ccu_ddn *hw_to_ccu_ddn(struct clk_hw *hw)
>
> --
> 2.50.1
>
next prev parent reply other threads:[~2025-08-18 9:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-18 9:28 [PATCH v3 0/3] clk: spacemit: fix i2s clock Troy Mitchell
2025-08-18 9:28 ` [PATCH v3 1/3] dt-bindings: clock: spacemit: introduce i2s pre-clock to " Troy Mitchell
2025-08-18 9:28 ` [PATCH v3 2/3] clk: spacemit: introduce pre-div for ddn clock Troy Mitchell
2025-08-18 9:49 ` Haylen Chu [this message]
2025-08-18 9:28 ` [PATCH v3 3/3] clk: spacemit: fix i2s clock Troy Mitchell
2025-08-18 10:04 ` Haylen Chu
2025-08-18 13:08 ` Troy Mitchell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aKL3FghKPUaQcagM@ketchup \
--to=heylenay@4d2.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dlan@gentoo.org \
--cc=elder@riscstar.com \
--cc=inochiama@outlook.com \
--cc=krzk+dt@kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=mturquette@baylibre.com \
--cc=robh@kernel.org \
--cc=sboyd@kernel.org \
--cc=spacemit@lists.linux.dev \
--cc=troy.mitchell@linux.spacemit.com \
--cc=weijinmei@linux.spacemit.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox