ASoC: codecs: lpass-va-macro: Fix LPASS Codec Version for SC7280

According to both the static definition in downstream...

  yupik-audio-overlay.dtsi: qcom,bolero-version = <4>;
  #define BOLERO_VERSION_2_0 0x0004)

and the runtime detection:

  CDC_VA_TOP_CSR_CORE_ID_0=0x1
  CDC_VA_TOP_CSR_CORE_ID_1=0xf

SC7280 has LPASS Codec Version 2.0 and not, as declared with
sm8250_va_data LPASS_CODEC_VERSION_1_0.

Create new va_macro_data with .version not set to use the runtime
detection and correctly get .version = LPASS_CODEC_VERSION_2_0.

Fixes: 77212f300bfd ("ASoC: codecs: lpass-va-macro: set the default codec version for sm8250")
Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Link: https://patch.msgid.link/20260526-sc7280-va-macro-2-0-v1-1-2c1b572fa388@fairphone.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c
index 528d5b167ecffeaf8fa19dbb8e56bb4674bd23d6..58a5798823d7fde1299ee2ee939ee39733548507 100644 (file)
--- a/sound/soc/codecs/lpass-va-macro.c
+++ b/sound/soc/codecs/lpass-va-macro.c
@@ -244,6 +244,11 @@ static const struct va_macro_data sm8250_va_data = {
        .version = LPASS_CODEC_VERSION_1_0,
 };
 
+static const struct va_macro_data sc7280_va_data = {
+       .has_swr_master = false,
+       .has_npl_clk = false,
+};
+
 static const struct va_macro_data sm8450_va_data = {
        .has_swr_master = true,
        .has_npl_clk = true,
@@ -1755,7 +1760,7 @@ static const struct dev_pm_ops va_macro_pm_ops = {
 };
 
 static const struct of_device_id va_macro_dt_match[] = {
-       { .compatible = "qcom,sc7280-lpass-va-macro", .data = &sm8250_va_data },
+       { .compatible = "qcom,sc7280-lpass-va-macro", .data = &sc7280_va_data },
        { .compatible = "qcom,sm6115-lpass-va-macro", .data = &sm8450_va_data },
        { .compatible = "qcom,sm8250-lpass-va-macro", .data = &sm8250_va_data },
        { .compatible = "qcom,sm8450-lpass-va-macro", .data = &sm8450_va_data },