Commit 40b37136 authored by Miquel Raynal's avatar Miquel Raynal Committed by Mark Brown

ASoC: tlv320aic32x4: Fix bdiv clock rate derivation

Current code expects a single channel to be always used. Fix this
situation by forwarding the number of channels used. Then fix the
derivation of the bdiv clock rate.

Fixes: 96c3bb00 ("ASoC: tlv320aic32x4: Dynamically Determine Clocking")
Suggested-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/r/20200911173140.29984-3-miquel.raynal@bootlin.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5b4458eb
...@@ -665,7 +665,7 @@ static int aic32x4_set_processing_blocks(struct snd_soc_component *component, ...@@ -665,7 +665,7 @@ static int aic32x4_set_processing_blocks(struct snd_soc_component *component,
} }
static int aic32x4_setup_clocks(struct snd_soc_component *component, static int aic32x4_setup_clocks(struct snd_soc_component *component,
unsigned int sample_rate) unsigned int sample_rate, unsigned int channels)
{ {
u8 aosr; u8 aosr;
u16 dosr; u16 dosr;
...@@ -753,7 +753,9 @@ static int aic32x4_setup_clocks(struct snd_soc_component *component, ...@@ -753,7 +753,9 @@ static int aic32x4_setup_clocks(struct snd_soc_component *component,
dosr); dosr);
clk_set_rate(clocks[5].clk, clk_set_rate(clocks[5].clk,
sample_rate * 32); sample_rate * 32 *
channels);
return 0; return 0;
} }
} }
...@@ -775,7 +777,8 @@ static int aic32x4_hw_params(struct snd_pcm_substream *substream, ...@@ -775,7 +777,8 @@ static int aic32x4_hw_params(struct snd_pcm_substream *substream,
u8 iface1_reg = 0; u8 iface1_reg = 0;
u8 dacsetup_reg = 0; u8 dacsetup_reg = 0;
aic32x4_setup_clocks(component, params_rate(params)); aic32x4_setup_clocks(component, params_rate(params),
params_channels(params));
switch (params_width(params)) { switch (params_width(params)) {
case 16: case 16:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment