| Message ID | 1496998369-30556-5-git-send-email-sugar.zhang@rock-chips.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
On Fri, Jun 09, 2017 at 04:52:49PM +0800, Sugar Zhang wrote: > we found mclk maybe not precise as required because of PLL, > but it still can be used and no side effect. for example, if we > require mclk 11289600, but get 11289598, it doesn't matter. > so using DIV_ROUND_CLOSEST to fix it. This is fine but seems to depend on patch 2.
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 2a15a00..b56e00d 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -282,10 +282,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_fs * params_rate(params); - if (bclk_rate && 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,
we found mclk maybe not precise as required because of PLL, but it still can be used and no side effect. for example, if we require mclk 11289600, but get 11289598, it doesn't matter. so using DIV_ROUND_CLOSEST to fix it. Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com> --- sound/soc/rockchip/rockchip_i2s.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)