diff options
| author | Richard Fitzgerald <rf@opensource.cirrus.com> | 2022-08-17 13:23:47 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-08-17 13:58:50 +0100 |
| commit | c2683ecfd1850cc99829691b2e1d90f1a6d75b8b (patch) | |
| tree | dff2ae5d5802a9bc068f7791d359bb3cfcb75ef9 /sound/soc/codecs/cs42l42.c | |
| parent | db568aab37c1af80057c12c97e6af049495c3e4a (diff) | |
| download | linux-c2683ecfd1850cc99829691b2e1d90f1a6d75b8b.tar.gz | |
ASoC: cs42l42: Use snd_soc_tdm_params_to_bclk()
Use the new snd_soc_tdm_params_to_bclk() helper function to calculate the bclk. This function handles most of the previous manipulation and makes the code tidier. Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> Link: https://lore.kernel.org/r/20220817122347.1356773-6-rf@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/cs42l42.c')
| -rw-r--r-- | sound/soc/codecs/cs42l42.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c index 40d5a2d98f2f..de1e276bdf7d 100644 --- a/sound/soc/codecs/cs42l42.c +++ b/sound/soc/codecs/cs42l42.c @@ -893,22 +893,21 @@ static int cs42l42_pcm_hw_params(struct snd_pcm_substream *substream, struct cs42l42_private *cs42l42 = snd_soc_component_get_drvdata(component); unsigned int channels = params_channels(params); unsigned int width = (params_width(params) / 8) - 1; + unsigned int slot_width = 0; unsigned int val = 0; int ret; cs42l42->srate = params_rate(params); - cs42l42->bclk = snd_soc_params_to_bclk(params); - - /* I2S frame always has 2 channels even for mono audio */ - if (channels == 1) - cs42l42->bclk *= 2; /* * Assume 24-bit samples are in 32-bit slots, to prevent SCLK being * more than assumed (which would result in overclocking). */ if (params_width(params) == 24) - cs42l42->bclk = (cs42l42->bclk / 3) * 4; + slot_width = 32; + + /* I2S frame always has multiple of 2 channels */ + cs42l42->bclk = snd_soc_tdm_params_to_bclk(params, slot_width, 0, 2); switch (substream->stream) { case SNDRV_PCM_STREAM_CAPTURE: |