ASoC: rt1015: support TDM slot configuration
Subsystems (3)
PATCH v2 1/1 ASoC: rt1015: support TDM slot configuration
From: Shuming Fan <[email protected]>
Add TDM slot callback function to support TDM configuration
--- sound/soc/codecs/rt1015.c | 107 ++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/rt1015.h | 42 +++++++++++++++ 2 files changed, 149 insertions(+)
sound/soc/codecs/rt1015.c +107 -0
@@ -944,6 +944,112 @@ static int rt1015_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio)return 0 ; } +static int rt1015_set_tdm_slot (struct snd_soc_dai *dai, +unsigned int tx_mask,unsigned int rx_mask,int slots,int slot_width) +{ +struct snd_soc_component *component = dai->component; +unsigned int val =0 , rx_slotnum, tx_slotnum; +int ret =0 , first_bit; + +switch (slots) { +case 2 : + val |=RT1015_I2S_TX_2CH ; +break ; +case 4 : + val |=RT1015_I2S_TX_4CH ; +break ; +case 6 : + val |=RT1015_I2S_TX_6CH ; +break ; +case 8 : + val |=RT1015_I2S_TX_8CH ; +break ; +default : + ret = -EINVAL ; + goto _set_tdm_err_; + } + +switch (slot_width) { +case 16 : + val |=RT1015_I2S_CH_TX_LEN_16B ; +break ; +case 20 : + val |=RT1015_I2S_CH_TX_LEN_20B ; +break ; +case 24 : + val |=RT1015_I2S_CH_TX_LEN_24B ; +break ; +case 32 : + val |=RT1015_I2S_CH_TX_LEN_32B ; +break ; +default : + ret = -EINVAL ; + goto _set_tdm_err_; + } + +/* Rx slot configuration */ + rx_slotnum =hweight_long (rx_mask); +if (rx_slotnum !=1 ) { + ret = -EINVAL ; +dev_err (component->dev,"too many rx slots or zero slot\n" ); + goto _set_tdm_err_; + } + +/* This is an assumption that the system sends stereo audio to the amplifier typically. +* And the stereo audio is placed in slot 0/2/4/6 as the starting slot. +* According to the slot number, we also set the mono LR to select the right slot. +*/ + first_bit =__ffs (rx_mask); +switch (first_bit) { +case 0 : +case 2 : +case 4 : +case 6 : +snd_soc_component_update_bits (component, +RT1015_PAD_DRV2 ,RT1015_MONO_LR_SEL_MASK , +RT1015_MONO_L_CHANNEL ); +snd_soc_component_update_bits (component, +RT1015_TDM1_4 , +RT1015_TDM_I2S_TX_L_DAC1_1_MASK | +RT1015_TDM_I2S_TX_R_DAC1_1_MASK , + (first_bit <<RT1015_TDM_I2S_TX_L_DAC1_1_SFT ) | + ((first_bit+1 ) <<RT1015_TDM_I2S_TX_R_DAC1_1_SFT )); +break ; +case 1 : +case 3 : +case 5 : +case 7 : +snd_soc_component_update_bits (component, +RT1015_PAD_DRV2 ,RT1015_MONO_LR_SEL_MASK , +RT1015_MONO_R_CHANNEL ); +snd_soc_component_update_bits (component, +RT1015_TDM1_4 , +RT1015_TDM_I2S_TX_L_DAC1_1_MASK | +RT1015_TDM_I2S_TX_R_DAC1_1_MASK , + ((first_bit-1 ) <<RT1015_TDM_I2S_TX_L_DAC1_1_SFT ) | + (first_bit <<RT1015_TDM_I2S_TX_R_DAC1_1_SFT )); +break ; +default : + ret = -EINVAL ; + goto _set_tdm_err_; + } + +/* Tx slot configuration */ + tx_slotnum =hweight_long (tx_mask); +if (tx_slotnum) { + ret = -EINVAL ; +dev_err (component->dev,"doesn't need to support tx slots\n" ); + goto _set_tdm_err_; + } + +snd_soc_component_update_bits (component,RT1015_TDM1_1 , +RT1015_I2S_CH_TX_MASK |RT1015_I2S_CH_RX_MASK | +RT1015_I2S_CH_TX_LEN_MASK |RT1015_I2S_CH_RX_LEN_MASK , val); + +_set_tdm_err_: +return ret; +} +static int rt1015_probe (struct snd_soc_component *component) { struct rt1015_priv *rt1015 =
@@ -975,6 +1081,7 @@ static struct snd_soc_dai_ops rt1015_aif_dai_ops = { .hw_params = rt1015_hw_params, .set_fmt = rt1015_set_dai_fmt, .set_bclk_ratio = rt1015_set_bclk_ratio, + .set_tdm_slot = rt1015_set_tdm_slot, };static struct snd_soc_dai_driver rt1015_dai[] = {
sound/soc/codecs/rt1015.h +42 -0
54 lines not on this page · raw message
Signature · 1 line
2.28.0
Quoted 25 lines
sound/soc/codecs/rt1015.c +24
-0+/* This is an assumption that the system sends stereo audio to the amplifier typically. +* And the stereo audio is placed in slot 0/2/4/6 as the starting slot. +* According to the slot number, we also set the mono LR to select the right slot. +*/ + first_bit =__ffs (rx_mask); +switch (first_bit) { +case 0 : +case 2 : +case 4 : +case 6 : +snd_soc_component_update_bits (component, +RT1015_PAD_DRV2 ,RT1015_MONO_LR_SEL_MASK , +RT1015_MONO_L_CHANNEL ); +snd_soc_component_update_bits (component, +RT1015_TDM1_4 , +RT1015_TDM_I2S_TX_L_DAC1_1_MASK | +RT1015_TDM_I2S_TX_R_DAC1_1_MASK , + (first_bit <<RT1015_TDM_I2S_TX_L_DAC1_1_SFT ) | + ((first_bit+1 ) <<RT1015_TDM_I2S_TX_R_DAC1_1_SFT )); +break ; +case 1 : +case 3 : +case 5 : +case 7 :
sound/soc/codecs/rt1015.c static int rt1015_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio) · line 1031
Quoted 10 lines
sound/soc/codecs/rt1015.c +10
-0+snd_soc_component_update_bits (component, +RT1015_PAD_DRV2 ,RT1015_MONO_LR_SEL_MASK , +RT1015_MONO_R_CHANNEL ); +snd_soc_component_update_bits (component, +RT1015_TDM1_4 , +RT1015_TDM_I2S_TX_L_DAC1_1_MASK | +RT1015_TDM_I2S_TX_R_DAC1_1_MASK , + ((first_bit-1 ) <<RT1015_TDM_I2S_TX_L_DAC1_1_SFT ) | + (first_bit <<RT1015_TDM_I2S_TX_R_DAC1_1_SFT )); +break ;
One more question from me: if you have 2 amplifiers on the same link and use slot 0 and 1, what would be the rx_mask for each amplifier? If the mask is BIT(0) for left and BIT(1) for right, it looks like both would render L+R?
Also should the settings and channel selection be modifiable using the codec configuration as we've done for RT1308, e.g. rt1015-1 would use LL and rt1015-2 would use RR?
Thanks
-Pierre
Quoted 32 lines
Review
Quoted 1 line
(quoted diff) +1
-0+ /* This is an assumption that the system sends stereo audio to theamplifier typically.
Review
Quoted 2 lines
(quoted diff) +2
-0+ * And the stereo audio is placed in slot 0/2/4/6 as the starting slot. + * According to the slot number, we also set the mono LR to select theright slot.
Quoted 27 lines
sound/soc/codecs/rt1015.c +27
-0+*/ + first_bit =__ffs (rx_mask); +switch (first_bit) { +case 0 : +case 2 : +case 4 : +case 6 : +snd_soc_component_update_bits (component, +RT1015_PAD_DRV2 ,RT1015_MONO_LR_SEL_MASK , +RT1015_MONO_L_CHANNEL ); +snd_soc_component_update_bits (component, +RT1015_TDM1_4 , +RT1015_TDM_I2S_TX_L_DAC1_1_MASK | +RT1015_TDM_I2S_TX_R_DAC1_1_MASK , + (first_bit <<RT1015_TDM_I2S_TX_L_DAC1_1_SFT ) | + ((first_bit+1 ) <<RT1015_TDM_I2S_TX_R_DAC1_1_SFT )); +break ; +case 1 : +case 3 : +case 5 : +case 7 : +snd_soc_component_update_bits (component, +RT1015_PAD_DRV2 ,RT1015_MONO_LR_SEL_MASK , +RT1015_MONO_R_CHANNEL ); + snd_soc_component_update_bits(component, + RT1015_TDM1_4, + RT1015_TDM_I2S_TX_L_DAC1_1_MASK |
Quoted 8 lines
sound/soc/codecs/rt1015.c static int rt1015_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio) · line 1031
Quoted 4 lines
sound/soc/codecs/rt1015.c +4
-0+RT1015_TDM_I2S_TX_R_DAC1_1_MASK , + ((first_bit-1 ) <<RT1015_TDM_I2S_TX_L_DAC1_1_SFT ) | + (first_bit << RT1015_TDM_I2S_TX_R_DAC1_1_SFT)); +break ;One more question from me: if you have 2 amplifiers on the same link and use slot 0 and 1, what would be the
rx_maskfor each amplifier? If the mask is BIT(0) for left and BIT(1) for right, it looks like both would render L+R?
Oh, I didn't expect that the customers want to render L+R when using TDM configuration.
Quoted 3 lines
Also should the settings and channel selection be modifiable using the codec configuration as we've done for RT1308, e.g. rt1015-1 would use LL and rt1015-2 would use RR?
OK, I will remove the mono LR channel selection in rt1015_set_tdm_slot function. The channel selection setting would be controlled by the application level only. RT1015 is a mono amplifier, it could select 'Left', 'Right' and 'Left + Right average'.
Quoted 5 lines
Thanks
-Pierre------Please consider the environment before printing this e-mail.