Commit 903e8509 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown

ASoC: codecs: lpass-rx-macro: add missing handling of v2.1 codec

We have also v2.1 version of the codec (see 'enum lpass_codec_version'),
so handle it as well in all switch cases.

Fixes: dbacef05 ("ASoC: codec: lpass-rx-macro: prepare driver to accomdate new codec versions")
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://patch.msgid.link/20240625160614.450506-1-krzysztof.kozlowski@linaro.orgReviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6f9faf14
...@@ -1601,6 +1601,7 @@ static bool rx_is_rw_register(struct device *dev, unsigned int reg) ...@@ -1601,6 +1601,7 @@ static bool rx_is_rw_register(struct device *dev, unsigned int reg)
case LPASS_CODEC_VERSION_1_1: case LPASS_CODEC_VERSION_1_1:
case LPASS_CODEC_VERSION_1_2: case LPASS_CODEC_VERSION_1_2:
case LPASS_CODEC_VERSION_2_0: case LPASS_CODEC_VERSION_2_0:
case LPASS_CODEC_VERSION_2_1:
return rx_pre_2_5_is_rw_register(dev, reg); return rx_pre_2_5_is_rw_register(dev, reg);
case LPASS_CODEC_VERSION_2_5: case LPASS_CODEC_VERSION_2_5:
case LPASS_CODEC_VERSION_2_6: case LPASS_CODEC_VERSION_2_6:
...@@ -3639,6 +3640,7 @@ static int rx_macro_component_probe(struct snd_soc_component *component) ...@@ -3639,6 +3640,7 @@ static int rx_macro_component_probe(struct snd_soc_component *component)
case LPASS_CODEC_VERSION_1_1: case LPASS_CODEC_VERSION_1_1:
case LPASS_CODEC_VERSION_1_2: case LPASS_CODEC_VERSION_1_2:
case LPASS_CODEC_VERSION_2_0: case LPASS_CODEC_VERSION_2_0:
case LPASS_CODEC_VERSION_2_1:
controls = rx_macro_def_snd_controls; controls = rx_macro_def_snd_controls;
num_controls = ARRAY_SIZE(rx_macro_def_snd_controls); num_controls = ARRAY_SIZE(rx_macro_def_snd_controls);
widgets = rx_macro_def_dapm_widgets; widgets = rx_macro_def_dapm_widgets;
...@@ -3812,6 +3814,7 @@ static int rx_macro_probe(struct platform_device *pdev) ...@@ -3812,6 +3814,7 @@ static int rx_macro_probe(struct platform_device *pdev)
case LPASS_CODEC_VERSION_1_1: case LPASS_CODEC_VERSION_1_1:
case LPASS_CODEC_VERSION_1_2: case LPASS_CODEC_VERSION_1_2:
case LPASS_CODEC_VERSION_2_0: case LPASS_CODEC_VERSION_2_0:
case LPASS_CODEC_VERSION_2_1:
rx->rxn_reg_stride = 0x80; rx->rxn_reg_stride = 0x80;
def_count = ARRAY_SIZE(rx_defaults) + ARRAY_SIZE(rx_pre_2_5_defaults); def_count = ARRAY_SIZE(rx_defaults) + ARRAY_SIZE(rx_pre_2_5_defaults);
reg_defaults = kmalloc_array(def_count, sizeof(struct reg_default), GFP_KERNEL); reg_defaults = kmalloc_array(def_count, sizeof(struct reg_default), GFP_KERNEL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment