ASoC: qcom: lpass: Fix apq8016 compat string to match yaml

The documented yaml compat string for the apq8016 is
"qcom,apq8016-lpass-cpu" not "qcom,lpass-cpu-apq8016". Looking at the other
lpass compat strings the general form is "qcom,socnum-lpass-cpu".

We need to fix both the driver and dts to match.

Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Link: https://lore.kernel.org/r/20220628120435.3044939-2-bryan.odonoghue@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c
index 3efa133d1c6410abe461f3c4ca35d47976bd3cdb..abaf694ee9a3a13be626e405370ff407ba4ae3c8 100644 (file)
--- a/sound/soc/qcom/lpass-apq8016.c
+++ b/sound/soc/qcom/lpass-apq8016.c
@@ -293,6 +293,7 @@ static struct lpass_variant apq8016_data = {
 
 static const struct of_device_id apq8016_lpass_cpu_device_id[] __maybe_unused = {
        { .compatible = "qcom,lpass-cpu-apq8016", .data = &apq8016_data },
+       { .compatible = "qcom,apq8016-lpass-cpu", .data = &apq8016_data },
        {}
 };
 MODULE_DEVICE_TABLE(of, apq8016_lpass_cpu_device_id);

diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c
index e6846ad2b5fa46a55b69880cd338dec798b3e014..53f9bf6581d3365d33442938303c6183175acd3d 100644 (file)
--- a/sound/soc/qcom/lpass-cpu.c
+++ b/sound/soc/qcom/lpass-cpu.c
@@ -1102,6 +1102,11 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev)
        if (!match || !match->data)
                return -EINVAL;
 
+       if (of_device_is_compatible(dev->of_node, "qcom,lpass-cpu-apq8016")) {
+               dev_warn(dev, "%s compatible is deprecated\n",
+                        match->compatible);
+       }
+
        drvdata->variant = (struct lpass_variant *)match->data;
        variant = drvdata->variant;