[PATCH v3 0/2] Fix apq8016 compat string

[PATCH v3 0/2] Fix apq8016 compat string

[Bryan O'Donoghue]

V3:
- Marks qcom,lpass-cpu-apq8016 as deprecated instead of removing - Bjorn

V2:
- Adds Reviewed-by: - Srini
- Adds Fixes - Srini

V1:
Reusing the apq8016 on msm8939 I found running checkpatch that the compat
string for the LPASS was throwing a warning.

This is easily fixed by alinging the YAML, DTS and driver to the documented
compat string

-			compatible = "qcom,lpass-cpu-apq8016";
+			compatible = "qcom,apq8016-lpass-cpu";


Bryan O'Donoghue (2):
  ASoC: qcom: lpass: Fix apq8016 compat string to match yaml
  arm64: dts: qcom: Fix apq8016 compat string to match yaml

 arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +-
 sound/soc/qcom/lpass-apq8016.c        | 1 +
 sound/soc/qcom/lpass-cpu.c            | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

-- 
2.35.1

[PATCH v3 1/2] ASoC: qcom: lpass: Fix apq8016 compat string to match yaml

[Bryan O'Donoghue]

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>
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(+)

diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c
index 3efa133d1c64..abaf694ee9a3 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 e6846ad2b5fa..53f9bf6581d3 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;
 
-- 
2.35.1

Re: [PATCH v3 1/2] ASoC: qcom: lpass: Fix apq8016 compat string to match yaml

[Bjorn Andersson]

On Fri 29 Apr 17:03 CDT 2022, Bryan O'Donoghue wrote:

Adding the sound maintainers to To/Cc, please advice if you would prefer
Bryan to resubmit the patch with proper recipients.

> 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>
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>

Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>

Once this patch is picked up I can merge the dts change.

Regards,
Bjorn

> ---
>  sound/soc/qcom/lpass-apq8016.c | 1 +
>  sound/soc/qcom/lpass-cpu.c     | 5 +++++
>  2 files changed, 6 insertions(+)
> 
> diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c
> index 3efa133d1c64..abaf694ee9a3 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 e6846ad2b5fa..53f9bf6581d3 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;
>  
> -- 
> 2.35.1
> 

Re: [PATCH v3 1/2] ASoC: qcom: lpass: Fix apq8016 compat string to match yaml

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 276 bytes --]

On Mon, Jun 27, 2022 at 03:40:22PM -0500, Bjorn Andersson wrote:

> On Fri 29 Apr 17:03 CDT 2022, Bryan O'Donoghue wrote:
> 
> Adding the sound maintainers to To/Cc, please advice if you would prefer
> Bryan to resubmit the patch with proper recipients.

Yes, please.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[PATCH v3 2/2] arm64: dts: qcom: Fix apq8016 compat string to match yaml

[Bryan O'Donoghue]

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: 3761a3618f55 ("arm64: dts: qcom: add lpass node")
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
 arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index e34963505e07..452cdfbf8ef9 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -1392,7 +1392,7 @@ sound: sound@7702000 {
 
 		lpass: audio-controller@7708000 {
 			status = "disabled";
-			compatible = "qcom,lpass-cpu-apq8016";
+			compatible = "qcom,apq8016-lpass-cpu";
 
 			/*
 			 * Note: Unlike the name would suggest, the SEC_I2S_CLK
-- 
2.35.1

Re: [PATCH v3 0/2] Fix apq8016 compat string

[Bryan O'Donoghue]

On 29/04/2022 23:03, Bryan O'Donoghue wrote:
> V3:
> - Marks qcom,lpass-cpu-apq8016 as deprecated instead of removing - Bjorn
> 
> V2:
> - Adds Reviewed-by: - Srini
> - Adds Fixes - Srini
> 
> V1:
> Reusing the apq8016 on msm8939 I found running checkpatch that the compat
> string for the LPASS was throwing a warning.
> 
> This is easily fixed by alinging the YAML, DTS and driver to the documented
> compat string
> 
> -			compatible = "qcom,lpass-cpu-apq8016";
> +			compatible = "qcom,apq8016-lpass-cpu";
> 
> 
> Bryan O'Donoghue (2):
>    ASoC: qcom: lpass: Fix apq8016 compat string to match yaml
>    arm64: dts: qcom: Fix apq8016 compat string to match yaml
> 
>   arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +-
>   sound/soc/qcom/lpass-apq8016.c        | 1 +
>   sound/soc/qcom/lpass-cpu.c            | 5 +++++
>   3 files changed, 7 insertions(+), 1 deletion(-)
> 
ping