ASoC: tlv320aic32x4: Fix TAS2505/TAS2521 processing block selection
The TAS2505/TAS2521 does support only three processing block options, unlike
TLV320AIC32x4 which supports 25. This is documented in TI slau472 2.5.1.2
Processing Blocks and Page 0 / Register 60: DAC Instruction Set - 0x00 / 0x3C.
Limit the Processing Blocks maximum value to 3 on TAS2505/TAS2521 and select
processing block PRB_P1 always, because for the configuration of teh codec
implemented in this driver, this is the best quality option.
Fixes: b4525b6196
("ASoC: tlv320aic32x4: add support for TAS2505")
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Claudius Heine <ch@denx.de>
Cc: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20210720200348.182139-1-marex@denx.de
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
d00f541a49
Коммит
090c57da5f
|
@ -682,11 +682,20 @@ static int aic32x4_set_dosr(struct snd_soc_component *component, u16 dosr)
|
|||
static int aic32x4_set_processing_blocks(struct snd_soc_component *component,
|
||||
u8 r_block, u8 p_block)
|
||||
{
|
||||
if (r_block > 18 || p_block > 25)
|
||||
return -EINVAL;
|
||||
struct aic32x4_priv *aic32x4 = snd_soc_component_get_drvdata(component);
|
||||
|
||||
snd_soc_component_write(component, AIC32X4_ADCSPB, r_block);
|
||||
snd_soc_component_write(component, AIC32X4_DACSPB, p_block);
|
||||
if (aic32x4->type == AIC32X4_TYPE_TAS2505) {
|
||||
if (r_block || p_block > 3)
|
||||
return -EINVAL;
|
||||
|
||||
snd_soc_component_write(component, AIC32X4_DACSPB, p_block);
|
||||
} else { /* AIC32x4 */
|
||||
if (r_block > 18 || p_block > 25)
|
||||
return -EINVAL;
|
||||
|
||||
snd_soc_component_write(component, AIC32X4_ADCSPB, r_block);
|
||||
snd_soc_component_write(component, AIC32X4_DACSPB, p_block);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -695,6 +704,7 @@ static int aic32x4_setup_clocks(struct snd_soc_component *component,
|
|||
unsigned int sample_rate, unsigned int channels,
|
||||
unsigned int bit_depth)
|
||||
{
|
||||
struct aic32x4_priv *aic32x4 = snd_soc_component_get_drvdata(component);
|
||||
u8 aosr;
|
||||
u16 dosr;
|
||||
u8 adc_resource_class, dac_resource_class;
|
||||
|
@ -721,19 +731,28 @@ static int aic32x4_setup_clocks(struct snd_soc_component *component,
|
|||
adc_resource_class = 6;
|
||||
dac_resource_class = 8;
|
||||
dosr_increment = 8;
|
||||
aic32x4_set_processing_blocks(component, 1, 1);
|
||||
if (aic32x4->type == AIC32X4_TYPE_TAS2505)
|
||||
aic32x4_set_processing_blocks(component, 0, 1);
|
||||
else
|
||||
aic32x4_set_processing_blocks(component, 1, 1);
|
||||
} else if (sample_rate <= 96000) {
|
||||
aosr = 64;
|
||||
adc_resource_class = 6;
|
||||
dac_resource_class = 8;
|
||||
dosr_increment = 4;
|
||||
aic32x4_set_processing_blocks(component, 1, 9);
|
||||
if (aic32x4->type == AIC32X4_TYPE_TAS2505)
|
||||
aic32x4_set_processing_blocks(component, 0, 1);
|
||||
else
|
||||
aic32x4_set_processing_blocks(component, 1, 9);
|
||||
} else if (sample_rate == 192000) {
|
||||
aosr = 32;
|
||||
adc_resource_class = 3;
|
||||
dac_resource_class = 4;
|
||||
dosr_increment = 2;
|
||||
aic32x4_set_processing_blocks(component, 13, 19);
|
||||
if (aic32x4->type == AIC32X4_TYPE_TAS2505)
|
||||
aic32x4_set_processing_blocks(component, 0, 1);
|
||||
else
|
||||
aic32x4_set_processing_blocks(component, 13, 19);
|
||||
} else {
|
||||
dev_err(component->dev, "Sampling rate not supported\n");
|
||||
return -EINVAL;
|
||||
|
|
Загрузка…
Ссылка в новой задаче