* [PATCH v2 0/2] Fix apq8016 compat string
@ 2022-04-19 11:37 ` Bryan O'Donoghue
0 siblings, 0 replies; 8+ messages in thread
From: Bryan O'Donoghue @ 2022-04-19 11:37 UTC (permalink / raw)
To: srinivas.kandagatla, robh+dt, krzk+dt
Cc: linux-arm-msm, alsa-devel, bryan.odonoghue, devicetree
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 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
2.35.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 1/2] ASoC: qcom: lpass: Fix apq8016 compat string to match yaml
2022-04-19 11:37 ` Bryan O'Donoghue
@ 2022-04-19 11:37 ` Bryan O'Donoghue
-1 siblings, 0 replies; 8+ messages in thread
From: Bryan O'Donoghue @ 2022-04-19 11:37 UTC (permalink / raw)
To: srinivas.kandagatla, robh+dt, krzk+dt
Cc: alsa-devel, linux-arm-msm, devicetree, bryan.odonoghue
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c
index 3efa133d1c64..10edc5e9c8ef 100644
--- a/sound/soc/qcom/lpass-apq8016.c
+++ b/sound/soc/qcom/lpass-apq8016.c
@@ -292,7 +292,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);
--
2.35.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2 1/2] ASoC: qcom: lpass: Fix apq8016 compat string to match yaml
@ 2022-04-19 11:37 ` Bryan O'Donoghue
0 siblings, 0 replies; 8+ messages in thread
From: Bryan O'Donoghue @ 2022-04-19 11:37 UTC (permalink / raw)
To: srinivas.kandagatla, robh+dt, krzk+dt
Cc: linux-arm-msm, alsa-devel, bryan.odonoghue, devicetree
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c
index 3efa133d1c64..10edc5e9c8ef 100644
--- a/sound/soc/qcom/lpass-apq8016.c
+++ b/sound/soc/qcom/lpass-apq8016.c
@@ -292,7 +292,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);
--
2.35.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v2 1/2] ASoC: qcom: lpass: Fix apq8016 compat string to match yaml
2022-04-19 11:37 ` Bryan O'Donoghue
@ 2022-04-19 16:58 ` Bjorn Andersson
-1 siblings, 0 replies; 8+ messages in thread
From: Bjorn Andersson @ 2022-04-19 16:58 UTC (permalink / raw)
To: Bryan O'Donoghue
Cc: devicetree, alsa-devel, linux-arm-msm, robh+dt,
srinivas.kandagatla, krzk+dt
On Tue 19 Apr 04:37 PDT 2022, 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")
> Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> ---
> sound/soc/qcom/lpass-apq8016.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c
> index 3efa133d1c64..10edc5e9c8ef 100644
> --- a/sound/soc/qcom/lpass-apq8016.c
> +++ b/sound/soc/qcom/lpass-apq8016.c
> @@ -292,7 +292,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 },
Removing this will break existing MSM8916 DTBs, so please retain this
entry with a comment that it's the deprecated compatible.
Regards,
Bjorn
> + { .compatible = "qcom,apq8016-lpass-cpu", .data = &apq8016_data },
> {}
> };
> MODULE_DEVICE_TABLE(of, apq8016_lpass_cpu_device_id);
> --
> 2.35.1
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v2 1/2] ASoC: qcom: lpass: Fix apq8016 compat string to match yaml
@ 2022-04-19 16:58 ` Bjorn Andersson
0 siblings, 0 replies; 8+ messages in thread
From: Bjorn Andersson @ 2022-04-19 16:58 UTC (permalink / raw)
To: Bryan O'Donoghue
Cc: srinivas.kandagatla, robh+dt, krzk+dt, alsa-devel, linux-arm-msm,
devicetree
On Tue 19 Apr 04:37 PDT 2022, 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")
> Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> ---
> sound/soc/qcom/lpass-apq8016.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c
> index 3efa133d1c64..10edc5e9c8ef 100644
> --- a/sound/soc/qcom/lpass-apq8016.c
> +++ b/sound/soc/qcom/lpass-apq8016.c
> @@ -292,7 +292,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 },
Removing this will break existing MSM8916 DTBs, so please retain this
entry with a comment that it's the deprecated compatible.
Regards,
Bjorn
> + { .compatible = "qcom,apq8016-lpass-cpu", .data = &apq8016_data },
> {}
> };
> MODULE_DEVICE_TABLE(of, apq8016_lpass_cpu_device_id);
> --
> 2.35.1
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 2/2] arm64: dts: qcom: Fix apq8016 compat string to match yaml
2022-04-19 11:37 ` Bryan O'Donoghue
@ 2022-04-19 11:37 ` Bryan O'Donoghue
-1 siblings, 0 replies; 8+ messages in thread
From: Bryan O'Donoghue @ 2022-04-19 11:37 UTC (permalink / raw)
To: srinivas.kandagatla, robh+dt, krzk+dt
Cc: alsa-devel, linux-arm-msm, devicetree, bryan.odonoghue
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
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2 2/2] arm64: dts: qcom: Fix apq8016 compat string to match yaml
@ 2022-04-19 11:37 ` Bryan O'Donoghue
0 siblings, 0 replies; 8+ messages in thread
From: Bryan O'Donoghue @ 2022-04-19 11:37 UTC (permalink / raw)
To: srinivas.kandagatla, robh+dt, krzk+dt
Cc: linux-arm-msm, alsa-devel, bryan.odonoghue, devicetree
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
^ permalink raw reply related [flat|nested] 8+ messages in thread