[11/11] dts: tc2: Update coresight bindings for hardware ports
diff mbox series

Message ID 1536661032-30481-12-git-send-email-suzuki.poulose@arm.com
State Superseded
Headers show
Series
  • dts: Update coresight device tree bindings
Related show

Commit Message

Suzuki Kuruppassery Poulose Sept. 11, 2018, 10:17 a.m. UTC
Switch to the new coresight bindings

Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Sudeep Holla <sudeep.holla@arm.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
---
 arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 90 +++++++++++++++++-------------
 1 file changed, 51 insertions(+), 39 deletions(-)

Comments

Sudeep Holla Sept. 11, 2018, 5:01 p.m. UTC | #1
On Tue, Sep 11, 2018 at 11:17:12AM +0100, Suzuki K Poulose wrote:
> Switch to the new coresight bindings
>

I still see the below warnings:

vexpress-v2p-ca15_a7.dtb: Warning (graph_child_address):
	/replicator/in-ports: graph node has single child node 'port@0',
	#address-cells/#size-cells are not necessary
vexpress-v2p-ca15_a7.dtb: Warning (graph_child_address):
	/funnel@20040000/out-ports: graph node has single child node 'port@0',
	#address-cells/#size-cells are not necessary

I need the below patch to fix them, let me know if it looks OK, I can
amend and apply.

Regards,
Sudeep

-->8

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
index 3a5090616bc6..8b926c30ccd1 100644
--- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
@@ -443,11 +443,7 @@
 		};
 
 		in-ports {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			port@0 {
-				reg = <0>;
+			port {
 				replicator_in_port0: endpoint {
 					remote-endpoint = <&funnel_out_port0>;
 				};
@@ -462,11 +458,7 @@
 		clocks = <&oscclk6a>;
 		clock-names = "apb_pclk";
 		out-ports {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			port@0 {
-				reg = <0>;
+			port {
 				funnel_out_port0: endpoint {
 					remote-endpoint =
 						<&replicator_in_port0>;
Suzuki Kuruppassery Poulose Sept. 11, 2018, 5:15 p.m. UTC | #2
On 09/11/2018 06:01 PM, Sudeep Holla wrote:
> On Tue, Sep 11, 2018 at 11:17:12AM +0100, Suzuki K Poulose wrote:
>> Switch to the new coresight bindings
>>
> 
> I still see the below warnings:
> 
> vexpress-v2p-ca15_a7.dtb: Warning (graph_child_address):
> 	/replicator/in-ports: graph node has single child node 'port@0',
> 	#address-cells/#size-cells are not necessary
> vexpress-v2p-ca15_a7.dtb: Warning (graph_child_address):
> 	/funnel@20040000/out-ports: graph node has single child node 'port@0',
> 	#address-cells/#size-cells are not necessary
> 
> I need the below patch to fix them, let me know if it looks OK, I can
> amend and apply.

Thanks for reporting. I purposefully added the "address-cells" and 
followed the format everywhere in the series thinking that, that is
indeed the formal way of doing it, rather than having implicit port
numbers. I can send an updated series fixing it everywhere.

Regards
Suzuki


> 
> Regards,
> Sudeep
> 
> -->8
> 
> diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
> index 3a5090616bc6..8b926c30ccd1 100644
> --- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
> +++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
> @@ -443,11 +443,7 @@
>   		};
>   
>   		in-ports {
> -			#address-cells = <1>;
> -			#size-cells = <0>;
> -
> -			port@0 {
> -				reg = <0>;
> +			port {
>   				replicator_in_port0: endpoint {
>   					remote-endpoint = <&funnel_out_port0>;
>   				};
> @@ -462,11 +458,7 @@
>   		clocks = <&oscclk6a>;
>   		clock-names = "apb_pclk";
>   		out-ports {
> -			#address-cells = <1>;
> -			#size-cells = <0>;
> -
> -			port@0 {
> -				reg = <0>;
> +			port {
>   				funnel_out_port0: endpoint {
>   					remote-endpoint =
>   						<&replicator_in_port0>;
>
Sudeep Holla Sept. 11, 2018, 5:23 p.m. UTC | #3
On 11/09/18 18:15, Suzuki K Poulose wrote:
> On 09/11/2018 06:01 PM, Sudeep Holla wrote:
>> On Tue, Sep 11, 2018 at 11:17:12AM +0100, Suzuki K Poulose wrote:
>>> Switch to the new coresight bindings
>>>
>>
>> I still see the below warnings:
>>
>> vexpress-v2p-ca15_a7.dtb: Warning (graph_child_address):
>>     /replicator/in-ports: graph node has single child node 'port@0',
>>     #address-cells/#size-cells are not necessary
>> vexpress-v2p-ca15_a7.dtb: Warning (graph_child_address):
>>     /funnel@20040000/out-ports: graph node has single child node
>> 'port@0',
>>     #address-cells/#size-cells are not necessary
>>
>> I need the below patch to fix them, let me know if it looks OK, I can
>> amend and apply.
> 
> Thanks for reporting. I purposefully added the "address-cells" and
> followed the format everywhere in the series thinking that, that is
> indeed the formal way of doing it, rather than having implicit port
> numbers. I can send an updated series fixing it everywhere.
> 
No need to post the update for TC2 unless it's different from what I
have proposed.
Suzuki Kuruppassery Poulose Sept. 11, 2018, 5:30 p.m. UTC | #4
On 09/11/2018 06:23 PM, Sudeep Holla wrote:
> 
> 
> On 11/09/18 18:15, Suzuki K Poulose wrote:
>> On 09/11/2018 06:01 PM, Sudeep Holla wrote:
>>> On Tue, Sep 11, 2018 at 11:17:12AM +0100, Suzuki K Poulose wrote:
>>>> Switch to the new coresight bindings
>>>>
>>>
>>> I still see the below warnings:
>>>
>>> vexpress-v2p-ca15_a7.dtb: Warning (graph_child_address):
>>>      /replicator/in-ports: graph node has single child node 'port@0',
>>>      #address-cells/#size-cells are not necessary
>>> vexpress-v2p-ca15_a7.dtb: Warning (graph_child_address):
>>>      /funnel@20040000/out-ports: graph node has single child node
>>> 'port@0',
>>>      #address-cells/#size-cells are not necessary
>>>
>>> I need the below patch to fix them, let me know if it looks OK, I can
>>> amend and apply.
>>
>> Thanks for reporting. I purposefully added the "address-cells" and
>> followed the format everywhere in the series thinking that, that is
>> indeed the formal way of doing it, rather than having implicit port
>> numbers. I can send an updated series fixing it everywhere.
>>
> No need to post the update for TC2 unless it's different from what I
> have proposed.
> 

Yes, the changes look good. Thanks Sudeep. I will drop this patch from
the next version then.

Btw, my kernel build didn't trigger those warnings.

Thanks
Suzuki

Patch
diff mbox series

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
index ac6b90e..3a50906 100644
--- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
@@ -393,10 +393,11 @@ 
 
 		clocks = <&oscclk6a>;
 		clock-names = "apb_pclk";
-		port {
-			etb_in_port: endpoint {
-				slave-mode;
-				remote-endpoint = <&replicator_out_port0>;
+		in-ports {
+			port {
+				etb_in_port: endpoint {
+					remote-endpoint = <&replicator_out_port0>;
+				};
 			};
 		};
 	};
@@ -407,10 +408,11 @@ 
 
 		clocks = <&oscclk6a>;
 		clock-names = "apb_pclk";
-		port {
-			tpiu_in_port: endpoint {
-				slave-mode;
-				remote-endpoint = <&replicator_out_port1>;
+		in-ports {
+			port {
+				tpiu_in_port: endpoint {
+					remote-endpoint = <&replicator_out_port1>;
+				};
 			};
 		};
 	};
@@ -421,11 +423,10 @@ 
 		 */
 		compatible = "arm,coresight-replicator";
 
-		ports {
+		out-ports {
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			/* replicator output ports */
 			port@0 {
 				reg = <0>;
 				replicator_out_port0: endpoint {
@@ -439,12 +440,15 @@ 
 					remote-endpoint = <&tpiu_in_port>;
 				};
 			};
+		};
 
-			/* replicator input port */
-			port@2 {
+		in-ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
 				reg = <0>;
 				replicator_in_port0: endpoint {
-					slave-mode;
 					remote-endpoint = <&funnel_out_port0>;
 				};
 			};
@@ -457,11 +461,10 @@ 
 
 		clocks = <&oscclk6a>;
 		clock-names = "apb_pclk";
-		ports {
+		out-ports {
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			/* funnel output port */
 			port@0 {
 				reg = <0>;
 				funnel_out_port0: endpoint {
@@ -469,28 +472,29 @@ 
 						<&replicator_in_port0>;
 				};
 			};
+		};
 
-			/* funnel input ports */
-			port@1 {
+		in-ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
 				reg = <0>;
 				funnel_in_port0: endpoint {
-					slave-mode;
 					remote-endpoint = <&ptm0_out_port>;
 				};
 			};
 
-			port@2 {
+			port@1 {
 				reg = <1>;
 				funnel_in_port1: endpoint {
-					slave-mode;
 					remote-endpoint = <&ptm1_out_port>;
 				};
 			};
 
-			port@3 {
+			port@2 {
 				reg = <2>;
 				funnel_in_port2: endpoint {
-					slave-mode;
 					remote-endpoint = <&etm0_out_port>;
 				};
 			};
@@ -500,7 +504,6 @@ 
 			port@4 {
 				reg = <4>;
 				funnel_in_port4: endpoint {
-					slave-mode;
 					remote-endpoint = <&etm1_out_port>;
 				};
 			};
@@ -508,7 +511,6 @@ 
 			port@5 {
 				reg = <5>;
 				funnel_in_port5: endpoint {
-					slave-mode;
 					remote-endpoint = <&etm2_out_port>;
 				};
 			};
@@ -522,9 +524,11 @@ 
 		cpu = <&cpu0>;
 		clocks = <&oscclk6a>;
 		clock-names = "apb_pclk";
-		port {
-			ptm0_out_port: endpoint {
-				remote-endpoint = <&funnel_in_port0>;
+		out-ports {
+			port {
+				ptm0_out_port: endpoint {
+					remote-endpoint = <&funnel_in_port0>;
+				};
 			};
 		};
 	};
@@ -536,9 +540,11 @@ 
 		cpu = <&cpu1>;
 		clocks = <&oscclk6a>;
 		clock-names = "apb_pclk";
-		port {
-			ptm1_out_port: endpoint {
-				remote-endpoint = <&funnel_in_port1>;
+		out-ports {
+			port {
+				ptm1_out_port: endpoint {
+					remote-endpoint = <&funnel_in_port1>;
+				};
 			};
 		};
 	};
@@ -550,9 +556,11 @@ 
 		cpu = <&cpu2>;
 		clocks = <&oscclk6a>;
 		clock-names = "apb_pclk";
-		port {
-			etm0_out_port: endpoint {
-				remote-endpoint = <&funnel_in_port2>;
+		out-ports {
+			port {
+				etm0_out_port: endpoint {
+					remote-endpoint = <&funnel_in_port2>;
+				};
 			};
 		};
 	};
@@ -564,9 +572,11 @@ 
 		cpu = <&cpu3>;
 		clocks = <&oscclk6a>;
 		clock-names = "apb_pclk";
-		port {
-			etm1_out_port: endpoint {
-				remote-endpoint = <&funnel_in_port4>;
+		out-ports {
+			port {
+				etm1_out_port: endpoint {
+					remote-endpoint = <&funnel_in_port4>;
+				};
 			};
 		};
 	};
@@ -578,9 +588,11 @@ 
 		cpu = <&cpu4>;
 		clocks = <&oscclk6a>;
 		clock-names = "apb_pclk";
-		port {
-			etm2_out_port: endpoint {
-				remote-endpoint = <&funnel_in_port5>;
+		out-ports {
+			port {
+				etm2_out_port: endpoint {
+					remote-endpoint = <&funnel_in_port5>;
+				};
 			};
 		};
 	};