| Message ID | 20220628002858.2638442-2-bryan.odonoghue@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Fix apq8016 compat string | expand |
On Tue, Jun 28, 2022 at 01:28:57AM +0100, Bryan O'Donoghue wrote: > 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. > > Fixes: dc1ebd1811e9 ("ASoC: qcom: Add apq8016 lpass driver support") This isn't really a fix and it's breaking an ABI which has been there since 2015. By tagging this as a fix you're doubtless going to get the stable people trying to backport it which will most likely break some users.
On 28/06/2022 12:03, Mark Brown wrote: > On Tue, Jun 28, 2022 at 01:28:57AM +0100, Bryan O'Donoghue wrote: >> 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". > > This doesn't apply against current code, please check and resend. What's the tree you are applying to here ? I applied it to linux-next just last night.. https://git.linaro.org/people/bryan.odonoghue/kernel.git/log/?h=linux-next-27-06-22-msm8939-no-cpr-v4 https://git.linaro.org/people/bryan.odonoghue/kernel.git/commit/?h=linux-next-27-06-22-msm8939-no-cpr-v4&id=5822d52637eff65b826097634d9a99a9bf1bf2b7 --- bod
On Tue, Jun 28, 2022 at 12:48:20PM +0100, Bryan O'Donoghue wrote: > On 28/06/2022 12:03, Mark Brown wrote: > > This doesn't apply against current code, please check and resend. > What's the tree you are applying to here ? The ASoC tree.
diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c index 3efa133d1c641..abaf694ee9a3a 100644 --- 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 e6846ad2b5fa4..53f9bf6581d33 100644 --- 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;
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. Fixes: dc1ebd1811e9 ("ASoC: qcom: Add apq8016 lpass driver support") 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> --- sound/soc/qcom/lpass-apq8016.c | 1 + sound/soc/qcom/lpass-cpu.c | 5 +++++ 2 files changed, 6 insertions(+)