2023-11-24 06:18:06

by Mao Jinlong

Subject: [PATCH] arm64: dts: qcom: Fix the warnings from coresight bindings

Fix all warnings in Qualcomm boards coming from Coresight bindings.

Signed-off-by: Mao Jinlong <[email protected]>
---
arch/arm64/boot/dts/qcom/msm8996.dtsi | 26 ----------------------
arch/arm64/boot/dts/qcom/msm8998.dtsi | 32 +++++++++++++++++----------
arch/arm64/boot/dts/qcom/sdm845.dtsi | 5 +----
arch/arm64/boot/dts/qcom/sm8150.dtsi | 5 +----
arch/arm64/boot/dts/qcom/sm8250.dtsi | 24 ++++----------------
5 files changed, 26 insertions(+), 66 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 6ba9da9e6a8b..e42c22b26adc 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -2637,24 +2637,6 @@ funnel1_out: endpoint {
};
};

- funnel@3023000 {
- compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
- reg = <0x3023000 0x1000>;
-
- clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
- clock-names = "apb_pclk", "atclk";
-
-
- out-ports {
- port {
- funnel2_out: endpoint {
- remote-endpoint =
- <&merge_funnel_in2>;
- };
- };
- };
- };
-
funnel@3025000 {
compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
reg = <0x3025000 0x1000>;
@@ -2681,14 +2663,6 @@ merge_funnel_in1: endpoint {
<&funnel1_out>;
};
};
-
- port@2 {
- reg = <2>;
- merge_funnel_in2: endpoint {
- remote-endpoint =
- <&funnel2_out>;
- };
- };
};

out-ports {
diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
index b485bf925ce6..ebc5ba1b369e 100644
--- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
@@ -2031,9 +2031,11 @@ etm5: etm@7c40000 {

cpu = <&CPU4>;

- port {
- etm4_out: endpoint {
- remote-endpoint = <&apss_funnel_in4>;
+ out-ports {
+ port {
+ etm4_out: endpoint {
+ remote-endpoint = <&apss_funnel_in4>;
+ };
};
};
};
@@ -2048,9 +2050,11 @@ etm6: etm@7d40000 {

cpu = <&CPU5>;

- port {
- etm5_out: endpoint {
- remote-endpoint = <&apss_funnel_in5>;
+ out-ports {
+ port {
+ etm5_out: endpoint {
+ remote-endpoint = <&apss_funnel_in5>;
+ };
};
};
};
@@ -2065,9 +2069,11 @@ etm7: etm@7e40000 {

cpu = <&CPU6>;

- port {
- etm6_out: endpoint {
- remote-endpoint = <&apss_funnel_in6>;
+ out-ports {
+ port {
+ etm6_out: endpoint {
+ remote-endpoint = <&apss_funnel_in6>;
+ };
};
};
};
@@ -2082,9 +2088,11 @@ etm8: etm@7f40000 {

cpu = <&CPU7>;

- port {
- etm7_out: endpoint {
- remote-endpoint = <&apss_funnel_in7>;
+ out-ports {
+ port {
+ etm7_out: endpoint {
+ remote-endpoint = <&apss_funnel_in7>;
+ };
};
};
};
diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index bf5e6eb9d313..c4dbca4c15f2 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -3545,11 +3545,8 @@ etf_out: endpoint {
};

in-ports {
- #address-cells = <1>;
- #size-cells = <0>;

- port@1 {
- reg = <1>;
+ port {
etf_in: endpoint {
remote-endpoint =
<&merge_funnel_out>;
diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
index 97623af13464..7bae3bc6af06 100644
--- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
@@ -2957,11 +2957,8 @@ replicator1_out: endpoint {
};

in-ports {
- #address-cells = <1>;
- #size-cells = <0>;

- port@1 {
- reg = <1>;
+ port {
replicator1_in: endpoint {
remote-endpoint = <&replicator_out1>;
};
diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index be970472f6c4..fa4e8887d53b 100644
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -3095,11 +3095,8 @@ tpda@6004000 {
clock-names = "apb_pclk";

out-ports {
- #address-cells = <1>;
- #size-cells = <0>;

- port@0 {
- reg = <0>;
+ port {
tpda_out_funnel_qatb: endpoint {
remote-endpoint = <&funnel_qatb_in_tpda>;
};
@@ -3142,11 +3139,7 @@ funnel_qatb_out_funnel_in0: endpoint {
};

in-ports {
- #address-cells = <1>;
- #size-cells = <0>;
-
- port@0 {
- reg = <0>;
+ port {
funnel_qatb_in_tpda: endpoint {
remote-endpoint = <&tpda_out_funnel_qatb>;
};
@@ -3355,11 +3348,8 @@ etf_out: endpoint {
};

in-ports {
- #address-cells = <1>;
- #size-cells = <0>;

- port@0 {
- reg = <0>;
+ port {
etf_in_funnel_swao_out: endpoint {
remote-endpoint = <&funnel_swao_out_etf>;
};
@@ -3443,8 +3433,6 @@ funnel@6c2d000 {
clock-names = "apb_pclk";

out-ports {
- #address-cells = <1>;
- #size-cells = <0>;
port {
tpdm_mm_out_tpda9: endpoint {
remote-endpoint = <&tpda_9_in_tpdm_mm>;
@@ -3710,11 +3698,7 @@ funnel_apss_merg_out_funnel_in1: endpoint {
};

in-ports {
- #address-cells = <1>;
- #size-cells = <0>;
-
- port@0 {
- reg = <0>;
+ port {
funnel_apss_merg_in_funnel_apss: endpoint {
remote-endpoint = <&funnel_apss_out_funnel_apss_merg>;
};
--
2.41.0

2023-11-24 07:54:13

by Krzysztof Kozlowski

Subject: Re: [PATCH] arm64: dts: qcom: Fix the warnings from coresight bindings

On 24/11/2023 07:17, Mao Jinlong wrote:
> Fix all warnings in Qualcomm boards coming from Coresight bindings.

One logical thing, one patch. That applies not only to Linux kernel, but
to all software projects.

>
> Signed-off-by: Mao Jinlong <[email protected]>
> ---
> arch/arm64/boot/dts/qcom/msm8996.dtsi | 26 ----------------------
> arch/arm64/boot/dts/qcom/msm8998.dtsi | 32 +++++++++++++++++----------
> arch/arm64/boot/dts/qcom/sdm845.dtsi | 5 +----
> arch/arm64/boot/dts/qcom/sm8150.dtsi | 5 +----
> arch/arm64/boot/dts/qcom/sm8250.dtsi | 24 ++++----------------
> 5 files changed, 26 insertions(+), 66 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> index 6ba9da9e6a8b..e42c22b26adc 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> @@ -2637,24 +2637,6 @@ funnel1_out: endpoint {
> };
> };
>
> - funnel@3023000 {
> - compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
> - reg = <0x3023000 0x1000>;
> -
> - clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> - clock-names = "apb_pclk", "atclk";
> -
> -
> - out-ports {
> - port {
> - funnel2_out: endpoint {
> - remote-endpoint =
> - <&merge_funnel_in2>;
> - };
> - };
> - };
> - };

Why do you remove nodes? How is this anyhow related to commit msg?
Nothing here is explained.

> -
> funnel@3025000 {
> compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
> reg = <0x3025000 0x1000>;
> @@ -2681,14 +2663,6 @@ merge_funnel_in1: endpoint {
> <&funnel1_out>;
> };
> };
> -
> - port@2 {
> - reg = <2>;
> - merge_funnel_in2: endpoint {
> - remote-endpoint =
> - <&funnel2_out>;
> - };

Why?

> - };
> };
>
> out-ports {
> diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
> index b485bf925ce6..ebc5ba1b369e 100644
> --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
> @@ -2031,9 +2031,11 @@ etm5: etm@7c40000 {
>
> cpu = <&CPU4>;
>
> - port {
> - etm4_out: endpoint {
> - remote-endpoint = <&apss_funnel_in4>;
> + out-ports {
> + port {

So you want to say out-ports is missing? Commit msg is really not
explaining anything.

> + etm4_out: endpoint {
> + remote-endpoint = <&apss_funnel_in4>;
> + };
> };


Best regards,
Krzysztof

2023-11-27 04:06:49

by Mao Jinlong

Subject: Re: [PATCH] arm64: dts: qcom: Fix the warnings from coresight bindings

On 11/24/2023 3:50 PM, Krzysztof Kozlowski wrote:
> On 24/11/2023 07:17, Mao Jinlong wrote:
>> Fix all warnings in Qualcomm boards coming from Coresight bindings.
>
> One logical thing, one patch. That applies not only to Linux kernel, but
> to all software projects.
>
>>
>> Signed-off-by: Mao Jinlong <[email protected]>
>> ---
>> arch/arm64/boot/dts/qcom/msm8996.dtsi | 26 ----------------------
>> arch/arm64/boot/dts/qcom/msm8998.dtsi | 32 +++++++++++++++++----------
>> arch/arm64/boot/dts/qcom/sdm845.dtsi | 5 +----
>> arch/arm64/boot/dts/qcom/sm8150.dtsi | 5 +----
>> arch/arm64/boot/dts/qcom/sm8250.dtsi | 24 ++++----------------
>> 5 files changed, 26 insertions(+), 66 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
>> index 6ba9da9e6a8b..e42c22b26adc 100644
>> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
>> @@ -2637,24 +2637,6 @@ funnel1_out: endpoint {
>> };
>> };
>>
>> - funnel@3023000 {
>> - compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
>> - reg = <0x3023000 0x1000>;
>> -
>> - clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
>> - clock-names = "apb_pclk", "atclk";
>> -
>> -
>> - out-ports {
>> - port {
>> - funnel2_out: endpoint {
>> - remote-endpoint =
>> - <&merge_funnel_in2>;
>> - };
>> - };
>> - };
>> - };
>
> Why do you remove nodes? How is this anyhow related to commit msg?
> Nothing here is explained.
>
>> -
>> funnel@3025000 {
>> compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
>> reg = <0x3025000 0x1000>;
>> @@ -2681,14 +2663,6 @@ merge_funnel_in1: endpoint {
>> <&funnel1_out>;
>> };
>> };
>> -
>> - port@2 {
>> - reg = <2>;
>> - merge_funnel_in2: endpoint {
>> - remote-endpoint =
>> - <&funnel2_out>;
>> - };
>
> Why?
>
>> - };
>> };
>>
>> out-ports {
>> diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
>> index b485bf925ce6..ebc5ba1b369e 100644
>> --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
>> @@ -2031,9 +2031,11 @@ etm5: etm@7c40000 {
>>
>> cpu = <&CPU4>;
>>
>> - port {
>> - etm4_out: endpoint {
>> - remote-endpoint = <&apss_funnel_in4>;
>> + out-ports {
>> + port {
>
> So you want to say out-ports is missing? Commit msg is really not
> explaining anything.
>
>> + etm4_out: endpoint {
>> + remote-endpoint = <&apss_funnel_in4>;
>> + };
>> };
>
>
> Best regards,
> Krzysztof
Thanks for the review. I will separate the patches and update the commit
message.

Thanks
Jinlong Mao

>