iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: cs530x: Calculate proper bclk rate using TDM

Browse Source 
Calculate the proper bclk rate using the number of tdm slots
and the width of the tdm data.

Fixes: 2884c29152 ("ASoC: cs530x: Support for cs530x ADCs")
Signed-off-by: Paul Handrigan <paulha@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20240710160416.2617173-1-paulha@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Paul Handrigan 2024-07-10 11:04:15 -05:00 committed by Mark Brown
parent e021e0eecb
commit c62bec0fe3
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sound/soc/codecs/cs530x.c
View File

@ -526,13 +526,15 @@ static int cs530x_hw_params(struct snd_pcm_substream *substream,
regmap_update_bits(regmap, CS530X_CLK_CFG_1,
CS530X_SAMPLE_RATE_MASK, fs_val);
if (cs530x->tdm_slots) {
if (regmap_test_bits(regmap, CS530X_SIGNAL_PATH_CFG,
CS530X_TDM_EN_MASK)) {
dev_dbg(component->dev, "Configuring for %d %d bit TDM slots\n",
cs530x->tdm_slots, cs530x->tdm_width);
cs530x->bclk = snd_soc_calc_bclk(cs530x->fs,
cs530x->tdm_width,
params_channels(params),
cs530x->tdm_slots);
cs530x->bclk = snd_soc_tdm_params_to_bclk(params,
cs530x->tdm_width,
cs530x->tdm_slots,
1);
} else {
cs530x->bclk = snd_soc_params_to_bclk(params);
}
@ -655,6 +657,9 @@ static int cs530x_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
return -EINVAL;
}
cs530x->tdm_width = slot_width;
cs530x->tdm_slots = slots;
return regmap_update_bits(regmap, CS530X_SIGNAL_PATH_CFG,
CS530X_ASP_TDM_SLOT_MASK,
val << CS530X_ASP_TDM_SLOT_SHIFT);

1
sound/soc/codecs/cs530x.h
View File

@ -96,6 +96,7 @@
#define CS530X_ASP_TDM_SLOT_MASK GENMASK(5, 3)
#define CS530X_ASP_TDM_SLOT_SHIFT 3
#define CS530X_ASP_CH_REVERSE BIT(9)
#define CS530X_TDM_EN_MASK BIT(2)
#define CS530X_ASP_FMT_I2S 0
#define CS530X_ASP_FMT_LJ 1
#define CS530X_ASP_FMT_DSP_A 0x6