arm64: dts: imx8mp: Move funnel outside from soc

PATCH Applied Fabio Estevam 3 participants 5 messages Sep 6, 2023 – Sep 25, 2023

Subsystems (2)

Device tree bindings Arm i.MX and Layerscape

lore

Share & tools

lore

Fabio Estevam

author reviewer

2023-09-06 11:55 UTC #0 lore raw

PATCH 1/2 arm64: dts: imx8mp: Move funnel outside from soc

From: Fabio Estevam <[email protected]>

The 'funnel' node does not contain a register range, so it should be placed outside of the soc node to fix schema warnings from simple-bus.yaml.

Signed-off-by Fabio Estevam <[email protected]>

---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 107 +++++++++++-----------
 1 file changed, 54 insertions(+), 53 deletions(-)

arch/arm64/boot/dts/freescale/imx8mp.dtsi +54 ~~-53~~

index 6f2f50e1639c..ee92043a4052 100644
@@ -202,6 +202,60 @@ clk_ext4: clock-ext4 {
 		clock-output-names = "clk_ext4";
 	};
 
+	funnel {
+		/*
+		 * non-configurable funnel don't show up on the AMBA
+		 * bus.  As such no need to add "arm,primecell".
+		 */
+		compatible = "arm,coresight-static-funnel";
+
+		in-ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+
+				ca_funnel_in_port0: endpoint {
+					remote-endpoint = <&etm0_out_port>;
+				};
+			};
+
+			port@1 {
+				reg = <1>;
+
+				ca_funnel_in_port1: endpoint {
+					remote-endpoint = <&etm1_out_port>;
+				};
+			};
+
+			port@2 {
+				reg = <2>;
+
+				ca_funnel_in_port2: endpoint {
+					remote-endpoint = <&etm2_out_port>;
+				};
+			};
+
+			port@3 {
+				reg = <3>;
+
+					ca_funnel_in_port3: endpoint {
+					remote-endpoint = <&etm3_out_port>;
+				};
+			};
+		};
+
+		out-ports {
+			port {
+
+				ca_funnel_out_port0: endpoint {
+					remote-endpoint = <&hugo_funnel_in_port0>;
+				};
+			};
+		};
+	};
+
 	reserved-memory {
 		#address-cells = <2>;
 		#size-cells = <2>;

@@ -368,59 +422,6 @@ etm3_out_port: endpoint {
 			};
 		};
 
-		funnel {
-			/*
-			 * non-configurable funnel don't show up on the AMBA
-			 * bus.  As such no need to add "arm,primecell".
-			 */
-			compatible = "arm,coresight-static-funnel";
-
-			in-ports {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				port@0 {
-					reg = <0>;
-
-					ca_funnel_in_port0: endpoint {
-						remote-endpoint = <&etm0_out_port>;
-					};
-				};
-
-				port@1 {
-					reg = <1>;
-
-					ca_funnel_in_port1: endpoint {
-						remote-endpoint = <&etm1_out_port>;
-					};
-				};
-
-				port@2 {
-					reg = <2>;
-
-					ca_funnel_in_port2: endpoint {
-						remote-endpoint = <&etm2_out_port>;
-					};
-				};
-
-				port@3 {
-					reg = <3>;
-
-					ca_funnel_in_port3: endpoint {
-						remote-endpoint = <&etm3_out_port>;
-					};
-				};
-			};
-
-			out-ports {
-				port {
-					ca_funnel_out_port0: endpoint {
-						remote-endpoint = <&hugo_funnel_in_port0>;
-					};
-				};
-			};
-		};
-
 		funnel@28c03000 {
 			compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
 			reg = <0x28c03000 0x1000>;

Signature · 1 line

2.34.1

Fabio Estevam

author reviewer

2023-09-06 11:55 UTC #1 lore raw

PATCH 2/2 arm64: dts: imx8mq: Move funnel outside from soc

From: Fabio Estevam <[email protected]>

The 'funnel' node does not contain a register range, so it should be placed outside of the soc node to fix schema warnings from simple-bus.yaml.

Signed-off-by Fabio Estevam <[email protected]>

---
 arch/arm64/boot/dts/freescale/imx8mq.dtsi | 106 +++++++++++-----------
 1 file changed, 53 insertions(+), 53 deletions(-)

arch/arm64/boot/dts/freescale/imx8mq.dtsi +53 ~~-53~~

index 35f07dfb4ca8..4b1ce9fc1758 100644
@@ -225,6 +225,59 @@ opp-1500000000 {
 		};
 	};
 
+	funnel {
+		/*
+		 * non-configurable funnel don't show up on the AMBA
+		 * bus.  As such no need to add "arm,primecell".
+		 */
+		compatible = "arm,coresight-static-funnel";
+
+		in-ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+
+				ca_funnel_in_port0: endpoint {
+					remote-endpoint = <&etm0_out_port>;
+				};
+			};
+
+			port@1 {
+				reg = <1>;
+
+				ca_funnel_in_port1: endpoint {
+					remote-endpoint = <&etm1_out_port>;
+				};
+			};
+
+			port@2 {
+				reg = <2>;
+
+				ca_funnel_in_port2: endpoint {
+					remote-endpoint = <&etm2_out_port>;
+				};
+			};
+
+			port@3 {
+				reg = <3>;
+
+				ca_funnel_in_port3: endpoint {
+					remote-endpoint = <&etm3_out_port>;
+				};
+			};
+		};
+
+		out-ports {
+			port {
+				ca_funnel_out_port0: endpoint {
+					remote-endpoint = <&hugo_funnel_in_port0>;
+				};
+			};
+		};
+	};
+
 	pmu {
 		compatible = "arm,cortex-a53-pmu";
 		interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;

@@ -394,59 +447,6 @@ etm3_out_port: endpoint {
 			};
 		};
 
-		funnel {
-			/*
-			 * non-configurable funnel don't show up on the AMBA
-			 * bus.  As such no need to add "arm,primecell".
-			 */
-			compatible = "arm,coresight-static-funnel";
-
-			in-ports {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				port@0 {
-					reg = <0>;
-
-					ca_funnel_in_port0: endpoint {
-						remote-endpoint = <&etm0_out_port>;
-					};
-				};
-
-				port@1 {
-					reg = <1>;
-
-					ca_funnel_in_port1: endpoint {
-						remote-endpoint = <&etm1_out_port>;
-					};
-				};
-
-				port@2 {
-					reg = <2>;
-
-					ca_funnel_in_port2: endpoint {
-						remote-endpoint = <&etm2_out_port>;
-					};
-				};
-
-				port@3 {
-					reg = <3>;
-
-					ca_funnel_in_port3: endpoint {
-						remote-endpoint = <&etm3_out_port>;
-					};
-				};
-			};
-
-			out-ports {
-				port {
-					ca_funnel_out_port0: endpoint {
-						remote-endpoint = <&hugo_funnel_in_port0>;
-					};
-				};
-			};
-		};
-
 		funnel@28c03000 {
 			compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
 			reg = <0x28c03000 0x1000>;

Signature · 1 line

2.34.1

Alexander Stein

Acked-by on v1 2/2

2023-09-07 06:43 UTC #2 lore raw

Re: [PATCH 2/2] arm64: dts: imx8mq: Move funnel outside from soc

Am Mittwoch, 6. September 2023, 13:54:44 CEST schrieb Fabio Estevam:

Quoted 7 lines

From: Fabio Estevam <[email protected]>
The 'funnel' node does not contain a register range, so it should be placed outside of the soc node to fix schema warnings from simple-bus.yaml.
Signed-off-by Fabio Estevam <[email protected]>

I noticed the warning in dtbs_check as well. LGTM

Acked-by Alexander Stein <[email protected]>

Quoted 19 lines

---
 arch/arm64/boot/dts/freescale/imx8mq.dtsi | 106 +++++++++++-----------
 1 file changed, 53 insertions(+), 53 deletions(-)

(quoted diff) +0 -0

b/arch/arm64/boot/dts/freescale/imx8mq.dtsi index
35f07dfb4ca8..4b1ce9fc1758 100644

arch/arm64/boot/dts/freescale/imx8mq.dtsi +6 -0

@@ -225,6 +225,59 @@ opp-1500000000 {
 		};
 	};
 
+	funnel {
+		/*
+		 * non-configurable funnel don't show up on the AMBA
+		 * bus.  As such no need to add "arm,primecell".
+		 */
+		compatible = "arm,coresight-static-funnel";

arch/arm64/boot/dts/freescale/imx8mq.dtsi opp-1500000000 { · line 243

Quoted 10 lines

arch/arm64/boot/dts/freescale/imx8mq.dtsi +10 -0

+
+		in-ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+
+				ca_funnel_in_port0: endpoint {
+					remote-endpoint =

<&etm0_out_port>;

arch/arm64/boot/dts/freescale/imx8mq.dtsi opp-1500000000 {

Quoted 8 lines

arch/arm64/boot/dts/freescale/imx8mq.dtsi +8 -0

+				};
+			};
+
+			port@1 {
+				reg = <1>;
+
+				ca_funnel_in_port1: endpoint {
+					remote-endpoint =

<&etm1_out_port>;

arch/arm64/boot/dts/freescale/imx8mq.dtsi opp-1500000000 {

Quoted 8 lines

arch/arm64/boot/dts/freescale/imx8mq.dtsi +8 -0

+				};
+			};
+
+			port@2 {
+				reg = <2>;
+
+				ca_funnel_in_port2: endpoint {
+					remote-endpoint =

<&etm2_out_port>;

arch/arm64/boot/dts/freescale/imx8mq.dtsi opp-1500000000 {

Quoted 8 lines

arch/arm64/boot/dts/freescale/imx8mq.dtsi +8 -0

+				};
+			};
+
+			port@3 {
+				reg = <3>;
+
+				ca_funnel_in_port3: endpoint {
+					remote-endpoint =

<&etm3_out_port>;

arch/arm64/boot/dts/freescale/imx8mq.dtsi opp-1500000000 {

Quoted 8 lines

arch/arm64/boot/dts/freescale/imx8mq.dtsi +8 -0

+				};
+			};
+		};
+
+		out-ports {
+			port {
+				ca_funnel_out_port0: endpoint {
+					remote-endpoint =

<&hugo_funnel_in_port0>;

Quoted 9 lines

arch/arm64/boot/dts/freescale/imx8mq.dtsi +5 -0

+				};
+			};
+		};
+	};
+
 	pmu {
 		compatible = "arm,cortex-a53-pmu";
 		interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/freescale/imx8mq.dtsi etm3_out_port: endpoint { · line 399

Quoted 6 lines

arch/arm64/boot/dts/freescale/imx8mq.dtsi +0 -3

@@ -394,59 +447,6 @@ etm3_out_port: endpoint {
 			};
 		};
 
-		funnel {
-			/*
-			 * non-configurable funnel don't show up on the

AMBA

arch/arm64/boot/dts/freescale/imx8mq.dtsi etm3_out_port: endpoint {

Quoted 12 lines

arch/arm64/boot/dts/freescale/imx8mq.dtsi +0 ~~-12~~

-			 * bus.  As such no need to add "arm,primecell".
-			 */
-			compatible = "arm,coresight-static-funnel";
-
-			in-ports {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				port@0 {
-					reg = <0>;
-
-					ca_funnel_in_port0: endpoint

{

arch/arm64/boot/dts/freescale/imx8mq.dtsi etm3_out_port: endpoint { · line 412

Quoted 1 line

arch/arm64/boot/dts/freescale/imx8mq.dtsi +0 -1
-						remote-endpoint = 

<&etm0_out_port>;

arch/arm64/boot/dts/freescale/imx8mq.dtsi etm3_out_port: endpoint {

Quoted 7 lines

arch/arm64/boot/dts/freescale/imx8mq.dtsi +0 -7

-					};
-				};
-
-				port@1 {
-					reg = <1>;
-
-					ca_funnel_in_port1: endpoint

{

arch/arm64/boot/dts/freescale/imx8mq.dtsi etm3_out_port: endpoint { · line 420

Quoted 1 line

arch/arm64/boot/dts/freescale/imx8mq.dtsi +0 -1
-						remote-endpoint = 

<&etm1_out_port>;

arch/arm64/boot/dts/freescale/imx8mq.dtsi etm3_out_port: endpoint {

Quoted 7 lines

arch/arm64/boot/dts/freescale/imx8mq.dtsi +0 -7

-					};
-				};
-
-				port@2 {
-					reg = <2>;
-
-					ca_funnel_in_port2: endpoint

{

arch/arm64/boot/dts/freescale/imx8mq.dtsi etm3_out_port: endpoint { · line 428

Quoted 1 line

arch/arm64/boot/dts/freescale/imx8mq.dtsi +0 -1
-						remote-endpoint = 

<&etm2_out_port>;

arch/arm64/boot/dts/freescale/imx8mq.dtsi etm3_out_port: endpoint {

Quoted 7 lines

arch/arm64/boot/dts/freescale/imx8mq.dtsi +0 -7

-					};
-				};
-
-				port@3 {
-					reg = <3>;
-
-					ca_funnel_in_port3: endpoint

{

arch/arm64/boot/dts/freescale/imx8mq.dtsi etm3_out_port: endpoint { · line 436

Quoted 1 line

arch/arm64/boot/dts/freescale/imx8mq.dtsi +0 -1
-						remote-endpoint = 

<&etm3_out_port>;

arch/arm64/boot/dts/freescale/imx8mq.dtsi etm3_out_port: endpoint {

Quoted 7 lines

arch/arm64/boot/dts/freescale/imx8mq.dtsi +0 -7
-					};
-				};
-			};
-
-			out-ports {
-				port {
-					ca_funnel_out_port0: 

endpoint {

arch/arm64/boot/dts/freescale/imx8mq.dtsi etm3_out_port: endpoint { · line 444

Quoted 1 line

arch/arm64/boot/dts/freescale/imx8mq.dtsi +0 -1
-						remote-endpoint = 

<&hugo_funnel_in_port0>;

arch/arm64/boot/dts/freescale/imx8mq.dtsi etm3_out_port: endpoint {

Quoted 7 lines

arch/arm64/boot/dts/freescale/imx8mq.dtsi +0 -5

-					};
-				};
-			};
-		};
-
 		funnel@28c03000 {
 			compatible = "arm,coresight-dynamic-funnel",

"arm,primecell";

Quoted 1 line

arch/arm64/boot/dts/freescale/imx8mq.dtsi +0 -0
 			reg = <0x28c03000 0x1000>;

Signature · 11 lines

TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany
Amtsgericht München, HRB 105018
Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider
http://www.tq-group.com/



_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Alexander Stein

Acked-by on v1 1/2

2023-09-07 06:43 UTC #3 lore raw

In reply to Fabio Estevam

Hi Fabio,

Am Mittwoch, 6. September 2023, 13:54:43 CEST schrieb Fabio Estevam:

Quoted 7 lines

From: Fabio Estevam <[email protected]>
The 'funnel' node does not contain a register range, so it should be placed outside of the soc node to fix schema warnings from simple-bus.yaml.
Signed-off-by Fabio Estevam <[email protected]>

I noticed the warning in dtbs_check as well. LGTM

Acked-by Alexander Stein <[email protected]>

Quoted 19 lines

---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 107 +++++++++++-----------
 1 file changed, 54 insertions(+), 53 deletions(-)

(quoted diff) +0 -0

b/arch/arm64/boot/dts/freescale/imx8mp.dtsi index
6f2f50e1639c..ee92043a4052 100644

arch/arm64/boot/dts/freescale/imx8mp.dtsi +6 -0

@@ -202,6 +202,60 @@ clk_ext4: clock-ext4 {
 		clock-output-names = "clk_ext4";
 	};
 
+	funnel {
+		/*
+		 * non-configurable funnel don't show up on the AMBA
+		 * bus.  As such no need to add "arm,primecell".
+		 */
+		compatible = "arm,coresight-static-funnel";

arch/arm64/boot/dts/freescale/imx8mp.dtsi clk_ext4: clock-ext4 { · line 220

Quoted 10 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi +10 -0

+
+		in-ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+
+				ca_funnel_in_port0: endpoint {
+					remote-endpoint =

<&etm0_out_port>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi clk_ext4: clock-ext4 {

Quoted 8 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi +8 -0

+				};
+			};
+
+			port@1 {
+				reg = <1>;
+
+				ca_funnel_in_port1: endpoint {
+					remote-endpoint =

<&etm1_out_port>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi clk_ext4: clock-ext4 {

Quoted 8 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi +8 -0

+				};
+			};
+
+			port@2 {
+				reg = <2>;
+
+				ca_funnel_in_port2: endpoint {
+					remote-endpoint =

<&etm2_out_port>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi clk_ext4: clock-ext4 {

Quoted 7 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi +7 -0
+				};
+			};
+
+			port@3 {
+				reg = <3>;
+
+					ca_funnel_in_port3: endpoint 

{

arch/arm64/boot/dts/freescale/imx8mp.dtsi clk_ext4: clock-ext4 { · line 244

Quoted 1 line

arch/arm64/boot/dts/freescale/imx8mp.dtsi +1 -0
+					remote-endpoint = 

<&etm3_out_port>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi clk_ext4: clock-ext4 {

Quoted 9 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi +9 -0

+				};
+			};
+		};
+
+		out-ports {
+			port {
+
+				ca_funnel_out_port0: endpoint {
+					remote-endpoint =

<&hugo_funnel_in_port0>;

Quoted 9 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi +5 -0

+				};
+			};
+		};
+	};
+
 	reserved-memory {
 		#address-cells = <2>;
 		#size-cells = <2>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi etm3_out_port: endpoint { · line 373

Quoted 6 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -3

@@ -368,59 +422,6 @@ etm3_out_port: endpoint {
 			};
 		};
 
-		funnel {
-			/*
-			 * non-configurable funnel don't show up on the

AMBA

arch/arm64/boot/dts/freescale/imx8mp.dtsi etm3_out_port: endpoint {

Quoted 12 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 ~~-12~~

-			 * bus.  As such no need to add "arm,primecell".
-			 */
-			compatible = "arm,coresight-static-funnel";
-
-			in-ports {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				port@0 {
-					reg = <0>;
-
-					ca_funnel_in_port0: endpoint

{

arch/arm64/boot/dts/freescale/imx8mp.dtsi etm3_out_port: endpoint { · line 386

Quoted 1 line

arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -1
-						remote-endpoint = 

<&etm0_out_port>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi etm3_out_port: endpoint {

Quoted 7 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -7

-					};
-				};
-
-				port@1 {
-					reg = <1>;
-
-					ca_funnel_in_port1: endpoint

{

arch/arm64/boot/dts/freescale/imx8mp.dtsi etm3_out_port: endpoint { · line 394

Quoted 1 line

arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -1
-						remote-endpoint = 

<&etm1_out_port>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi etm3_out_port: endpoint {

Quoted 7 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -7

-					};
-				};
-
-				port@2 {
-					reg = <2>;
-
-					ca_funnel_in_port2: endpoint

{

arch/arm64/boot/dts/freescale/imx8mp.dtsi etm3_out_port: endpoint { · line 402

Quoted 1 line

arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -1
-						remote-endpoint = 

<&etm2_out_port>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi etm3_out_port: endpoint {

Quoted 7 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -7

-					};
-				};
-
-				port@3 {
-					reg = <3>;
-
-					ca_funnel_in_port3: endpoint

{

arch/arm64/boot/dts/freescale/imx8mp.dtsi etm3_out_port: endpoint { · line 410

Quoted 1 line

arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -1
-						remote-endpoint = 

<&etm3_out_port>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi etm3_out_port: endpoint {

Quoted 7 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -7
-					};
-				};
-			};
-
-			out-ports {
-				port {
-					ca_funnel_out_port0: 

endpoint {

arch/arm64/boot/dts/freescale/imx8mp.dtsi etm3_out_port: endpoint { · line 418

Quoted 1 line

arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -1
-						remote-endpoint = 

<&hugo_funnel_in_port0>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi etm3_out_port: endpoint {

Quoted 7 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -5

-					};
-				};
-			};
-		};
-
 		funnel@28c03000 {
 			compatible = "arm,coresight-dynamic-funnel",

"arm,primecell";

Quoted 1 line

arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -0
 			reg = <0x28c03000 0x1000>;

Signature · 11 lines

TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany
Amtsgericht München, HRB 105018
Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider
http://www.tq-group.com/



_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Shawn Guo

Applied

2023-09-25 01:41 UTC #4 lore raw

In reply to Fabio Estevam

Quoted 7 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>
The 'funnel' node does not contain a register range, so it should be placed outside of the soc node to fix schema warnings from simple-bus.yaml.
Signed-off-by Fabio Estevam <[email protected]>

Applied both, thanks!