UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Bryan O'Donoghue 2022-06-28 13:04:34 +01:00 committed by Mark Brown
parent 6ed91f5b10
commit 2a2ef688b1
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sound/soc/qcom/lpass-apq8016.c
View File

@ -293,6 +293,7 @@ static struct lpass_variant apq8016_data = {
static const struct of_device_id apq8016_lpass_cpu_device_id[] __maybe_unused = { static const struct of_device_id apq8016_lpass_cpu_device_id[] __maybe_unused = {
{ .compatible = "qcom,lpass-cpu-apq8016", .data = &apq8016_data }, { .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); MODULE_DEVICE_TABLE(of, apq8016_lpass_cpu_device_id);

5
sound/soc/qcom/lpass-cpu.c
View File

@ -1102,6 +1102,11 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev)
if (!match || !match->data) if (!match || !match->data)
return -EINVAL; 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; drvdata->variant = (struct lpass_variant *)match->data;
variant = drvdata->variant; variant = drvdata->variant;