Skip to content

Commit 2a2ef68

Browse files
0xB0Dbroonie
authored andcommitted
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 <[email protected]> Reviewed-by: Bjorn Andersson <[email protected]> Signed-off-by: Bryan O'Donoghue <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 6ed91f5 commit 2a2ef68

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

sound/soc/qcom/lpass-apq8016.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ static struct lpass_variant apq8016_data = {
293293

294294
static const struct of_device_id apq8016_lpass_cpu_device_id[] __maybe_unused = {
295295
{ .compatible = "qcom,lpass-cpu-apq8016", .data = &apq8016_data },
296+
{ .compatible = "qcom,apq8016-lpass-cpu", .data = &apq8016_data },
296297
{}
297298
};
298299
MODULE_DEVICE_TABLE(of, apq8016_lpass_cpu_device_id);

sound/soc/qcom/lpass-cpu.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,6 +1102,11 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev)
11021102
if (!match || !match->data)
11031103
return -EINVAL;
11041104

1105+
if (of_device_is_compatible(dev->of_node, "qcom,lpass-cpu-apq8016")) {
1106+
dev_warn(dev, "%s compatible is deprecated\n",
1107+
match->compatible);
1108+
}
1109+
11051110
drvdata->variant = (struct lpass_variant *)match->data;
11061111
variant = drvdata->variant;
11071112

0 commit comments

Comments
 (0)