samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ASoC: lahaina: Update sample rate for speaker protection"

Browse Source
This commit is contained in:
qctecmdr
2020-05-14 22:04:37 -07:00
committed by Gerrit - the friendly Code Review server
parent 81b18718b9 cd507e1f28
commit 411fc736f9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
asoc/lahaina.c
View File

@@ -640,7 +640,7 @@ static struct dev_config cdc_dma_rx_cfg[] = {
/* Default configuration of Codec DMA Interface TX */ /* Default configuration of Codec DMA Interface TX */
static struct dev_config cdc_dma_tx_cfg[] = { static struct dev_config cdc_dma_tx_cfg[] = {
[WSA_CDC_DMA_TX_0] = {SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 2}, [WSA_CDC_DMA_TX_0] = {SAMPLING_RATE_8KHZ, SNDRV_PCM_FORMAT_S16_LE, 2},
[WSA_CDC_DMA_TX_1] = {SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 2}, [WSA_CDC_DMA_TX_1] = {SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 2},
[WSA_CDC_DMA_TX_2] = {SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 2}, [WSA_CDC_DMA_TX_2] = {SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 2},
[TX_CDC_DMA_TX_0] = {SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 2}, [TX_CDC_DMA_TX_0] = {SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 2},
@@ -4443,9 +4443,10 @@ static int msm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
break; break;
case MSM_BACKEND_DAI_WSA_CDC_DMA_TX_0: case MSM_BACKEND_DAI_WSA_CDC_DMA_TX_0:
idx = msm_cdc_dma_get_idx_from_beid(dai_link->id);
param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT, param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,
SNDRV_PCM_FORMAT_S32_LE); SNDRV_PCM_FORMAT_S32_LE);
rate->min = rate->max = SAMPLING_RATE_8KHZ; rate->min = rate->max = cdc_dma_tx_cfg[idx].sample_rate;
channels->min = channels->max = msm_vi_feed_tx_ch; channels->min = channels->max = msm_vi_feed_tx_ch;
break; break;