Commit e917b943 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Wei Xu
Browse files

arm64: dts: hi6220: Update coresight bindings for hardware ports 



Switch to updated coresight bindings for hw ports.

Cc: xuwei5@hisilicon.com
Cc: lipengcheng8@huawei.com
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Tested-by: default avatarLeo Yan <leo.yan@linaro.org>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarWei Xu <xuwei5@hisilicon.com>
parent b27dedf5

arch/arm64/boot/dts/hisilicon/hi6220-coresight.dtsi

+86 −95
Original line number Diff line number Diff line
@@ -20,22 +20,18 @@ funnel@f6401000 { 
			clocks = <&acpu_sctrl HI6220_ACPU_SFT_AT_S>;

			clock-names = "apb_pclk";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

			out-ports {

				port {

					soc_funnel_out: endpoint {

						remote-endpoint =

							<&etf_in>;

					};

				};

			};



				port@1 {

					reg = <0>;

			in-ports {

				port {

					soc_funnel_in: endpoint {

						slave-mode;

						remote-endpoint =

							<&acpu_funnel_out>;

					};
@@ -49,21 +45,17 @@ etf@f6402000 { 
			clocks = <&acpu_sctrl HI6220_ACPU_SFT_AT_S>;

			clock-names = "apb_pclk";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

			in-ports {

				port {

					etf_in: endpoint {

						slave-mode;

						remote-endpoint =

							<&soc_funnel_out>;

					};

				};

			};



				port@1 {

					reg = <0>;

			out-ports {

				port {

					etf_out: endpoint {

						remote-endpoint =

							<&replicator_in>;
@@ -77,20 +69,20 @@ replicator { 
			clocks = <&acpu_sctrl HI6220_ACPU_SFT_AT_S>;

			clock-names = "apb_pclk";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

			in-ports {

				port {

					replicator_in: endpoint {

						slave-mode;

						remote-endpoint =

							<&etf_out>;

					};

				};

			};



				port@1 {

			out-ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

					replicator_out0: endpoint {

						remote-endpoint =
@@ -98,7 +90,7 @@ replicator_out0: endpoint { 
					};

				};



				port@2 {

				port@1 {

					reg = <1>;

					replicator_out1: endpoint {

						remote-endpoint =
@@ -114,14 +106,9 @@ etr@f6404000 { 
			clocks = <&acpu_sctrl HI6220_ACPU_SFT_AT_S>;

			clock-names = "apb_pclk";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

			in-ports {

				port {

					etr_in: endpoint {

						slave-mode;

						remote-endpoint =

							<&replicator_out0>;

					};
@@ -135,14 +122,9 @@ tpiu@f6405000 { 
			clocks = <&acpu_sctrl HI6220_ACPU_SFT_AT_S>;

			clock-names = "apb_pclk";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

			in-ports {

				port {

					tpiu_in: endpoint {

						slave-mode;

						remote-endpoint =

							<&replicator_out1>;

					};
@@ -156,85 +138,78 @@ funnel@f6501000 { 
			clocks = <&acpu_sctrl HI6220_ACPU_SFT_AT_S>;

			clock-names = "apb_pclk";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

			out-ports {

				port {

					acpu_funnel_out: endpoint {

						remote-endpoint =

							<&soc_funnel_in>;

					};

				};

			};



				port@1 {

			in-ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

					acpu_funnel_in0: endpoint {

						slave-mode;

						remote-endpoint =

							<&etm0_out>;

					};

				};



				port@2 {

				port@1 {

					reg = <1>;

					acpu_funnel_in1: endpoint {

						slave-mode;

						remote-endpoint =

							<&etm1_out>;

					};

				};



				port@3 {

				port@2 {

					reg = <2>;

					acpu_funnel_in2: endpoint {

						slave-mode;

						remote-endpoint =

							<&etm2_out>;

					};

				};



				port@4 {

				port@3 {

					reg = <3>;

					acpu_funnel_in3: endpoint {

						slave-mode;

						remote-endpoint =

							<&etm3_out>;

					};

				};



				port@5 {

				port@4 {

					reg = <4>;

					acpu_funnel_in4: endpoint {

						slave-mode;

						remote-endpoint =

							<&etm4_out>;

					};

				};



				port@6 {

				port@5 {

					reg = <5>;

					acpu_funnel_in5: endpoint {

						slave-mode;

						remote-endpoint =

							<&etm5_out>;

					};

				};



				port@7 {

				port@6 {

					reg = <6>;

					acpu_funnel_in6: endpoint {

						slave-mode;

						remote-endpoint =

							<&etm6_out>;

					};

				};



				port@8 {

				port@7 {

					reg = <7>;

					acpu_funnel_in7: endpoint {

						slave-mode;

						remote-endpoint =

							<&etm7_out>;

					};
@@ -251,6 +226,7 @@ etm@f659c000 { 


			cpu = <&cpu0>;



			out-ports {

				port {

					etm0_out: endpoint {

						remote-endpoint =
@@ -258,6 +234,7 @@ etm0_out: endpoint { 
					};

				};

			};

		};



		etm@f659d000 {

			compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -268,6 +245,7 @@ etm@f659d000 { 


			cpu = <&cpu1>;



			out-ports {

				port {

					etm1_out: endpoint {

						remote-endpoint =
@@ -275,6 +253,7 @@ etm1_out: endpoint { 
					};

				};

			};

		};



		etm@f659e000 {

			compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -285,6 +264,7 @@ etm@f659e000 { 


			cpu = <&cpu2>;



			out-ports {

				port {

					etm2_out: endpoint {

						remote-endpoint =
@@ -292,6 +272,7 @@ etm2_out: endpoint { 
					};

				};

			};

		};



		etm@f659f000 {

			compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -302,6 +283,7 @@ etm@f659f000 { 


			cpu = <&cpu3>;



			out-ports {

				port {

					etm3_out: endpoint {

						remote-endpoint =
@@ -309,6 +291,7 @@ etm3_out: endpoint { 
					};

				};

			};

		};



		etm@f65dc000 {

			compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -319,6 +302,7 @@ etm@f65dc000 { 


			cpu = <&cpu4>;



			out-ports {

				port {

					etm4_out: endpoint {

						remote-endpoint =
@@ -326,6 +310,7 @@ etm4_out: endpoint { 
					};

				};

			};

		};



		etm@f65dd000 {

			compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -336,6 +321,7 @@ etm@f65dd000 { 


			cpu = <&cpu5>;



			out-ports {

				port {

					etm5_out: endpoint {

						remote-endpoint =
@@ -343,6 +329,7 @@ etm5_out: endpoint { 
					};

				};

			};

		};



		etm@f65de000 {

			compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -353,6 +340,7 @@ etm@f65de000 { 


			cpu = <&cpu6>;



			out-ports {

				port {

					etm6_out: endpoint {

						remote-endpoint =
@@ -360,6 +348,7 @@ etm6_out: endpoint { 
					};

				};

			};

		};



		etm@f65df000 {

			compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -370,6 +359,7 @@ etm@f65df000 { 


			cpu = <&cpu7>;



			out-ports {

				port {

					etm7_out: endpoint {

						remote-endpoint =
@@ -379,3 +369,4 @@ etm7_out: endpoint { 
			};

		};

	};

};