Unverified Commit d7bff141 authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown
Browse files

ASoC: codecs:lpass-wsa-macro: Fix vi feedback rate 



Currently the VI feedback rate is set to fixed 8K, fix this by getting
the correct rate from params_rate.

Without this patch incorrect rate will be set on the VI feedback
recording resulting in rate miss match and audio artifacts.

Fixes: 2c4066e5 ("ASoC: codecs: lpass-wsa-macro: add dapm widgets and route")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://patch.msgid.link/20250403160209.21613-2-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0af2f6be

sound/soc/codecs/lpass-wsa-macro.c

+36 −3
Original line number Diff line number Diff line
@@ -63,6 +63,10 @@ 
#define CDC_WSA_TX_SPKR_PROT_CLK_DISABLE	0

#define CDC_WSA_TX_SPKR_PROT_PCM_RATE_MASK	GENMASK(3, 0)

#define CDC_WSA_TX_SPKR_PROT_PCM_RATE_8K	0

#define CDC_WSA_TX_SPKR_PROT_PCM_RATE_16K	1

#define CDC_WSA_TX_SPKR_PROT_PCM_RATE_24K	2

#define CDC_WSA_TX_SPKR_PROT_PCM_RATE_32K	3

#define CDC_WSA_TX_SPKR_PROT_PCM_RATE_48K	4

#define CDC_WSA_TX0_SPKR_PROT_PATH_CFG0		(0x0248)

#define CDC_WSA_TX1_SPKR_PROT_PATH_CTL		(0x0264)

#define CDC_WSA_TX1_SPKR_PROT_PATH_CFG0		(0x0268)
@@ -407,6 +411,7 @@ struct wsa_macro { 
	int ear_spkr_gain;

	int spkr_gain_offset;

	int spkr_mode;

	u32 pcm_rate_vi;

	int is_softclip_on[WSA_MACRO_SOFTCLIP_MAX];

	int softclip_clk_users[WSA_MACRO_SOFTCLIP_MAX];

	struct regmap *regmap;
@@ -1280,6 +1285,7 @@ static int wsa_macro_hw_params(struct snd_pcm_substream *substream, 
			       struct snd_soc_dai *dai)

{

	struct snd_soc_component *component = dai->component;

	struct wsa_macro *wsa = snd_soc_component_get_drvdata(component);

	int ret;



	switch (substream->stream) {
@@ -1291,6 +1297,11 @@ static int wsa_macro_hw_params(struct snd_pcm_substream *substream, 
				__func__, params_rate(params));

			return ret;

		}

		break;

	case SNDRV_PCM_STREAM_CAPTURE:

		if (dai->id == WSA_MACRO_AIF_VI)

			wsa->pcm_rate_vi = params_rate(params);



		break;

	default:

		break;
@@ -1465,6 +1476,28 @@ static int wsa_macro_enable_vi_feedback(struct snd_soc_dapm_widget *w, 
	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);

	struct wsa_macro *wsa = snd_soc_component_get_drvdata(component);

	u32 tx_reg0, tx_reg1;

	u32 rate_val;



	switch (wsa->pcm_rate_vi) {

	case 8000:

		rate_val = CDC_WSA_TX_SPKR_PROT_PCM_RATE_8K;

		break;

	case 16000:

		rate_val = CDC_WSA_TX_SPKR_PROT_PCM_RATE_16K;

		break;

	case 24000:

		rate_val = CDC_WSA_TX_SPKR_PROT_PCM_RATE_24K;

		break;

	case 32000:

		rate_val = CDC_WSA_TX_SPKR_PROT_PCM_RATE_32K;

		break;

	case 48000:

		rate_val = CDC_WSA_TX_SPKR_PROT_PCM_RATE_48K;

		break;

	default:

		rate_val = CDC_WSA_TX_SPKR_PROT_PCM_RATE_8K;

		break;

	}



	if (test_bit(WSA_MACRO_TX0, &wsa->active_ch_mask[WSA_MACRO_AIF_VI])) {

		tx_reg0 = CDC_WSA_TX0_SPKR_PROT_PATH_CTL;
@@ -1485,10 +1518,10 @@ static int wsa_macro_enable_vi_feedback(struct snd_soc_dapm_widget *w, 
					      CDC_WSA_TX_SPKR_PROT_RESET);

		snd_soc_component_update_bits(component, tx_reg0,

					      CDC_WSA_TX_SPKR_PROT_PCM_RATE_MASK,

					      CDC_WSA_TX_SPKR_PROT_PCM_RATE_8K);

					      rate_val);

		snd_soc_component_update_bits(component, tx_reg1,

					      CDC_WSA_TX_SPKR_PROT_PCM_RATE_MASK,

					      CDC_WSA_TX_SPKR_PROT_PCM_RATE_8K);

					      rate_val);

		snd_soc_component_update_bits(component, tx_reg0,

					      CDC_WSA_TX_SPKR_PROT_CLK_EN_MASK,

					      CDC_WSA_TX_SPKR_PROT_CLK_ENABLE);