]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ASoC: codecs: lpass-rx-macro: add missing handling of v2.1 codec
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Tue, 25 Jun 2024 16:06:14 +0000 (18:06 +0200)
committerMark Brown <broonie@kernel.org>
Tue, 25 Jun 2024 18:12:43 +0000 (19:12 +0100)
We have also v2.1 version of the codec (see 'enum lpass_codec_version'),
so handle it as well in all switch cases.

Fixes: dbacef05898d ("ASoC: codec: lpass-rx-macro: prepare driver to accomdate new codec versions")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://patch.msgid.link/20240625160614.450506-1-krzysztof.kozlowski@linaro.org
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/lpass-rx-macro.c

index 83791507ed132ea288bb5c41be6a073d8ace6123..8af86509a3ff7dec37f9dae21d31290314efca3d 100644 (file)
@@ -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_2:
        case LPASS_CODEC_VERSION_2_0:
+       case LPASS_CODEC_VERSION_2_1:
                return rx_pre_2_5_is_rw_register(dev, reg);
        case LPASS_CODEC_VERSION_2_5:
        case LPASS_CODEC_VERSION_2_6:
@@ -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_2:
        case LPASS_CODEC_VERSION_2_0:
+       case LPASS_CODEC_VERSION_2_1:
                controls = rx_macro_def_snd_controls;
                num_controls = ARRAY_SIZE(rx_macro_def_snd_controls);
                widgets = rx_macro_def_dapm_widgets;
@@ -3812,6 +3814,7 @@ static int rx_macro_probe(struct platform_device *pdev)
        case LPASS_CODEC_VERSION_1_1:
        case LPASS_CODEC_VERSION_1_2:
        case LPASS_CODEC_VERSION_2_0:
+       case LPASS_CODEC_VERSION_2_1:
                rx->rxn_reg_stride = 0x80;
                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);