devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sugar Zhang <sugar.zhang@rock-chips.com>
To: broonie@kernel.org, heiko@sntech.de
Cc: linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org,
	alsa-devel@alsa-project.org,
	Sugar Zhang <sugar.zhang@rock-chips.com>
Subject: [PATCH v3 02/14] ASoC: rockchip: i2s: Fixup clk div error
Date: Thu, 26 Aug 2021 12:01:48 +0800	[thread overview]
Message-ID: <1629950520-14190-2-git-send-email-sugar.zhang@rock-chips.com> (raw)
In-Reply-To: <1629950441-14118-1-git-send-email-sugar.zhang@rock-chips.com>

MCLK maybe not precise as required because of PLL,
but which still can be used and no side effect. so,
using DIV_ROUND_CLOSEST instead div.

e.g.

set mclk to 11289600 Hz, but get 11289598 Hz.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
---

Changes in v3: None
Changes in v2: None

 sound/soc/rockchip/rockchip_i2s.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index c9d5c52..05fce2c 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -280,10 +280,10 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream,
 	if (i2s->is_master_mode) {
 		mclk_rate = clk_get_rate(i2s->mclk);
 		bclk_rate = i2s->bclk_ratio * params_rate(params);
-		if (bclk_rate == 0 || mclk_rate % bclk_rate)
+		if (!bclk_rate)
 			return -EINVAL;
 
-		div_bclk = mclk_rate / bclk_rate;
+		div_bclk = DIV_ROUND_CLOSEST(mclk_rate, bclk_rate);
 		div_lrck = bclk_rate / params_rate(params);
 		regmap_update_bits(i2s->regmap, I2S_CKR,
 				   I2S_CKR_MDIV_MASK,
-- 
2.7.4




  parent reply	other threads:[~2021-08-26  4:02 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-26  4:00 [PATCH v3 0/14] Patches to update for rockchip i2s Sugar Zhang
2021-08-26  4:01 ` [PATCH v3 01/14] ASoC: rockchip: i2s: Add support for set bclk ratio Sugar Zhang
2021-08-26  4:01 ` Sugar Zhang [this message]
2021-08-26  4:01 ` [PATCH v3 03/14] ASoC: rockchip: i2s: Improve dma data transfer efficiency Sugar Zhang
2021-08-26  4:01 ` [PATCH v3 04/14] ASoC: rockchip: i2s: Fix regmap_ops hang Sugar Zhang
2021-08-26  4:01 ` [PATCH v3 05/14] ASoC: rockchip: i2s: Fix concurrency between tx/rx Sugar Zhang
2021-08-26 12:52   ` Mark Brown
2021-08-27  1:37     ` sugar zhang
2021-08-26  4:02 ` [PATCH v3 06/14] ASoC: rockchip: i2s: Reset the controller if soft reset failed Sugar Zhang
2021-08-26  4:02 ` [PATCH v3 07/14] ASoC: dt-bindings: rockchip: Document reset property for i2s Sugar Zhang
2021-08-26  4:02 ` [PATCH v3 08/14] ASoC: rockchip: i2s: Fixup config for DAIFMT_DSP_A/B Sugar Zhang
2021-08-26  4:02 ` [PATCH v3 09/14] ASoC: rockchip: i2s: Make playback/capture optional Sugar Zhang
2021-08-26  4:02 ` [PATCH v3 10/14] ASoC: rockchip: i2s: Add compatible for more SoCs Sugar Zhang
2021-08-26  4:03 ` [PATCH v3 11/14] ASoC: dt-bindings: rockchip: Add compatible strings " Sugar Zhang
2021-08-26  4:03 ` [PATCH v3 12/14] ASoC: rockchip: i2s: Add support for frame inversion Sugar Zhang
2021-08-26  4:03 ` [PATCH v3 13/14] ASoC: rockchip: i2s: Add support for TRCM property Sugar Zhang
2021-08-26  4:03 ` [PATCH v3 14/14] ASoC: dt-bindings: rockchip: i2s: Document property TRCM Sugar Zhang
2021-08-26 14:15 ` (subset) [PATCH v3 0/14] Patches to update for rockchip i2s Mark Brown

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=1629950520-14190-2-git-send-email-sugar.zhang@rock-chips.com \
    --to=sugar.zhang@rock-chips.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=heiko@sntech.de \
    --cc=linux-rockchip@lists.infradead.org \
    /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;
as well as URLs for NNTP newsgroup(s).