Commit f2e73989 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Shawn Guo
Browse files

ARM: dts: imx7: Update coresight binding for hardware ports 



Switch to the updated coresight bindings.

Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 6656c39a

arch/arm/boot/dts/imx7d.dtsi

+9 −5
Original line number Original line Diff line number Diff line
@@ -64,6 +64,7 @@ etm@3007d000 { 
			clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>;

			clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>;

			clock-names = "apb_pclk";

			clock-names = "apb_pclk";





			out-ports {

				port {

				port {

					etm1_out_port: endpoint {

					etm1_out_port: endpoint {

						remote-endpoint = <&ca_funnel_in_port1>;

						remote-endpoint = <&ca_funnel_in_port1>;
@@ -72,6 +73,7 @@ etm1_out_port: endpoint { 
			};

			};

		};

		};

	};

	};

};





&aips3 {

&aips3 {

	usbotg2: usb@30b20000 {

	usbotg2: usb@30b20000 {
@@ -153,11 +155,13 @@ pcie: pcie@33800000 { 
	};

	};

};

};





&ca_funnel_ports {

&ca_funnel_in_ports {

	#address-cells = <1>;

	#size-cells = <0>;



	port@1 {

	port@1 {

		reg = <1>;

		reg = <1>;

		ca_funnel_in_port1: endpoint {

		ca_funnel_in_port1: endpoint {

			slave-mode;

			remote-endpoint = <&etm1_out_port>;

			remote-endpoint = <&etm1_out_port>;

		};

		};

	};

	};

arch/arm/boot/dts/imx7s.dtsi

+37 −45
Original line number Original line Diff line number Diff line
@@ -120,7 +120,7 @@ replicator { 
		 */

		 */

		compatible = "arm,coresight-replicator";

		compatible = "arm,coresight-replicator";





		ports {

		out-ports {

			#address-cells = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			#size-cells = <0>;

				/* replicator output ports */

				/* replicator output ports */
@@ -137,12 +137,11 @@ replicator_out_port1: endpoint { 
					remote-endpoint = <&etr_in_port>;

					remote-endpoint = <&etr_in_port>;

				};

				};

			};

			};

		};





			/* replicator input port */

		in-ports {

			port@2 {

			port {

				reg = <0>;

				replicator_in_port0: endpoint {

				replicator_in_port0: endpoint {

					slave-mode;

					remote-endpoint = <&etf_out_port>;

					remote-endpoint = <&etf_out_port>;

				};

				};

			};

			};
@@ -182,28 +181,23 @@ funnel@30041000 { 
			clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>;

			clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>;

			clock-names = "apb_pclk";

			clock-names = "apb_pclk";





			ca_funnel_ports: ports {

			ca_funnel_in_ports: in-ports {

				#address-cells = <1>;

				port {

				#size-cells = <0>;



				/* funnel input ports */

				port@0 {

					reg = <0>;

					ca_funnel_in_port0: endpoint {

					ca_funnel_in_port0: endpoint {

						slave-mode;

						remote-endpoint = <&etm0_out_port>;

						remote-endpoint = <&etm0_out_port>;

					};

					};

				};

				};





				/* funnel output port */

				/* the other input ports are not connect to anything */

				port@2 {

			};

					reg = <0>;



			out-ports {

				port {

					ca_funnel_out_port0: endpoint {

					ca_funnel_out_port0: endpoint {

						remote-endpoint = <&hugo_funnel_in_port0>;

						remote-endpoint = <&hugo_funnel_in_port0>;

					};

					};

				};

				};





				/* the other input ports are not connect to anything */

			};

			};

		};

		};
@@ -214,12 +208,14 @@ etm@3007c000 { 
			clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>;

			clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>;

			clock-names = "apb_pclk";

			clock-names = "apb_pclk";





			out-ports {

				port {

				port {

					etm0_out_port: endpoint {

					etm0_out_port: endpoint {

						remote-endpoint = <&ca_funnel_in_port0>;

						remote-endpoint = <&ca_funnel_in_port0>;

					};

					};

				};

				};

			};

			};

		};





		funnel@30083000 {

		funnel@30083000 {

			compatible = "arm,coresight-funnel", "arm,primecell";

			compatible = "arm,coresight-funnel", "arm,primecell";
@@ -227,15 +223,13 @@ funnel@30083000 { 
			clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>;

			clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>;

			clock-names = "apb_pclk";

			clock-names = "apb_pclk";





			ports {

			in-ports {

				#address-cells = <1>;

				#address-cells = <1>;

				#size-cells = <0>;

				#size-cells = <0>;





				/* funnel input ports */

				port@0 {

				port@0 {

					reg = <0>;

					reg = <0>;

					hugo_funnel_in_port0: endpoint {

					hugo_funnel_in_port0: endpoint {

						slave-mode;

						remote-endpoint = <&ca_funnel_out_port0>;

						remote-endpoint = <&ca_funnel_out_port0>;

					};

					};

				};

				};
@@ -243,18 +237,18 @@ hugo_funnel_in_port0: endpoint { 
				port@1 {

				port@1 {

					reg = <1>;

					reg = <1>;

					hugo_funnel_in_port1: endpoint {

					hugo_funnel_in_port1: endpoint {

						slave-mode; /* M4 input */

						/* M4 input */

					};

				};

				};

				/* the other input ports are not connect to anything */

			};

			};





				port@2 {

			out-ports {

					reg = <0>;

				port {

					hugo_funnel_out_port0: endpoint {

					hugo_funnel_out_port0: endpoint {

						remote-endpoint = <&etf_in_port>;

						remote-endpoint = <&etf_in_port>;

					};

					};

				};

				};



				/* the other input ports are not connect to anything */

			};

			};

		};

		};
@@ -264,20 +258,16 @@ etf@30084000 { 
			clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>;

			clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>;

			clock-names = "apb_pclk";

			clock-names = "apb_pclk";





			ports {

			in-ports {

				#address-cells = <1>;

				port {

				#size-cells = <0>;



				port@0 {

					reg = <0>;

					etf_in_port: endpoint {

					etf_in_port: endpoint {

						slave-mode;

						remote-endpoint = <&hugo_funnel_out_port0>;

						remote-endpoint = <&hugo_funnel_out_port0>;

					};

					};

				};

				};

			};





				port@1 {

			out-ports {

					reg = <0>;

				port {

					etf_out_port: endpoint {

					etf_out_port: endpoint {

						remote-endpoint = <&replicator_in_port0>;

						remote-endpoint = <&replicator_in_port0>;

					};

					};
@@ -291,13 +281,14 @@ etr@30086000 { 
			clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>;

			clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>;

			clock-names = "apb_pclk";

			clock-names = "apb_pclk";





			in-ports {

				port {

				port {

					etr_in_port: endpoint {

					etr_in_port: endpoint {

					slave-mode;

						remote-endpoint = <&replicator_out_port1>;

						remote-endpoint = <&replicator_out_port1>;

					};

					};

				};

				};

			};

			};

		};





		tpiu@30087000 {

		tpiu@30087000 {

			compatible = "arm,coresight-tpiu", "arm,primecell";

			compatible = "arm,coresight-tpiu", "arm,primecell";
@@ -305,13 +296,14 @@ tpiu@30087000 { 
			clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>;

			clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>;

			clock-names = "apb_pclk";

			clock-names = "apb_pclk";





			in-ports {

				port {

				port {

					tpiu_in_port: endpoint {

					tpiu_in_port: endpoint {

					slave-mode;

						remote-endpoint = <&replicator_out_port0>;

						remote-endpoint = <&replicator_out_port0>;

					};

					};

				};

				};

			};

			};

		};





		intc: interrupt-controller@31001000 {

		intc: interrupt-controller@31001000 {

			compatible = "arm,cortex-a7-gic";

			compatible = "arm,cortex-a7-gic";