Commit 3e18d3ca authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'hisi-arm32-dt-for-4.20' of git://github.com/hisilicon/linux-hisi into next/dt 

ARM: DT: Hisilicon ARM32 SoCs updates for 4.20

- Switch to updated coresight bindings for hip04 SoC

* tag 'hisi-arm32-dt-for-4.20' of git://github.com/hisilicon/linux-hisi

:
  arm: dts: hip04: Update coresight bindings for hardware ports

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 42724dd8 6523a0e1

arch/arm/boot/dts/hip04.dtsi

+176 −170
Original line number Diff line number Diff line
@@ -277,13 +277,14 @@ 


		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		in-ports {

			port {

				etb0_in_port: endpoint@0 {

				slave-mode;

					remote-endpoint = <&replicator0_out_port0>;

				};

			};

		};

	};



	etb@0,e3c82000 {

		compatible = "arm,coresight-etb10", "arm,primecell";
@@ -291,13 +292,14 @@ 


		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		in-ports {

			port {

				etb1_in_port: endpoint@0 {

				slave-mode;

					remote-endpoint = <&replicator1_out_port0>;

				};

			};

		};

	};



	etb@0,e3cc2000 {

		compatible = "arm,coresight-etb10", "arm,primecell";
@@ -305,13 +307,14 @@ 


		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		in-ports {

			port {

				etb2_in_port: endpoint@0 {

				slave-mode;

					remote-endpoint = <&replicator2_out_port0>;

				};

			};

		};

	};



	etb@0,e3d02000 {

		compatible = "arm,coresight-etb10", "arm,primecell";
@@ -319,13 +322,14 @@ 


		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		in-ports {

			port {

				etb3_in_port: endpoint@0 {

				slave-mode;

					remote-endpoint = <&replicator3_out_port0>;

				};

			};

		};

	};



	tpiu@0,e3c05000 {

		compatible = "arm,coresight-tpiu", "arm,primecell";
@@ -333,13 +337,14 @@ 


		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		in-ports {

			port {

				tpiu_in_port: endpoint@0 {

				slave-mode;

					remote-endpoint = <&funnel4_out_port0>;

				};

			};

		};

	};



	replicator0 {

		/* non-configurable replicators don't show up on the
@@ -347,7 +352,7 @@ 
		 */

		compatible = "arm,coresight-replicator";



		ports {

		out-ports {

			#address-cells = <1>;

			#size-cells = <0>;
@@ -365,12 +370,11 @@ 
					remote-endpoint = <&funnel4_in_port0>;

				};

			};

		};



			/* replicator input port */

			port@2 {

				reg = <0>;

		in-ports {

			port {

				replicator0_in_port0: endpoint {

					slave-mode;

					remote-endpoint = <&funnel0_out_port0>;

				};

			};
@@ -383,7 +387,7 @@ 
		 */

		compatible = "arm,coresight-replicator";



		ports {

		out-ports {

			#address-cells = <1>;

			#size-cells = <0>;
@@ -401,12 +405,11 @@ 
					remote-endpoint = <&funnel4_in_port1>;

				};

			};

		};



			/* replicator input port */

			port@2 {

				reg = <0>;

		in-ports {

			port {

				replicator1_in_port0: endpoint {

					slave-mode;

					remote-endpoint = <&funnel1_out_port0>;

				};

			};
@@ -419,11 +422,10 @@ 
		 */

		compatible = "arm,coresight-replicator";



		ports {

		out-ports {

			#address-cells = <1>;

			#size-cells = <0>;



			/* replicator output ports */

			port@0 {

				reg = <0>;

				replicator2_out_port0: endpoint {
@@ -437,12 +439,11 @@ 
					remote-endpoint = <&funnel4_in_port2>;

				};

			};

		};



			/* replicator input port */

			port@2 {

				reg = <0>;

		in-ports {

			port {

				replicator2_in_port0: endpoint {

					slave-mode;

					remote-endpoint = <&funnel2_out_port0>;

				};

			};
@@ -455,11 +456,10 @@ 
		 */

		compatible = "arm,coresight-replicator";



		ports {

		out-ports {

			#address-cells = <1>;

			#size-cells = <0>;



			/* replicator output ports */

			port@0 {

				reg = <0>;

				replicator3_out_port0: endpoint {
@@ -473,12 +473,11 @@ 
					remote-endpoint = <&funnel4_in_port3>;

				};

			};

		};



			/* replicator input port */

			port@2 {

				reg = <0>;

		in-ports {

			port {

				replicator3_in_port0: endpoint {

					slave-mode;

					remote-endpoint = <&funnel3_out_port0>;

				};

			};
@@ -491,48 +490,43 @@ 


		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			/* funnel output port */

			port@0 {

				reg = <0>;

		out-ports {

			port {

				funnel0_out_port0: endpoint {

					remote-endpoint =

						<&replicator0_in_port0>;

				};

			};

		};



			/* funnel input ports */

			port@1 {

		in-ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				funnel0_in_port0: endpoint {

					slave-mode;

					remote-endpoint = <&ptm0_out_port>;

				};

			};



			port@2 {

			port@1 {

				reg = <1>;

				funnel0_in_port1: endpoint {

					slave-mode;

					remote-endpoint = <&ptm1_out_port>;

				};

			};



			port@3 {

			port@2 {

				reg = <2>;

				funnel0_in_port2: endpoint {

					slave-mode;

					remote-endpoint = <&ptm2_out_port>;

				};

			};



			port@4 {

			port@3 {

				reg = <3>;

				funnel0_in_port3: endpoint {

					slave-mode;

					remote-endpoint = <&ptm3_out_port>;

				};

			};
@@ -545,48 +539,43 @@ 


		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			/* funnel output port */

			port@0 {

				reg = <0>;

		out-ports {

			port {

				funnel1_out_port0: endpoint {

					remote-endpoint =

						<&replicator1_in_port0>;

				};

			};

		};



			/* funnel input ports */

			port@1 {

		in-ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				funnel1_in_port0: endpoint {

					slave-mode;

					remote-endpoint = <&ptm4_out_port>;

				};

			};



			port@2 {

			port@1 {

				reg = <1>;

				funnel1_in_port1: endpoint {

					slave-mode;

					remote-endpoint = <&ptm5_out_port>;

				};

			};



			port@3 {

			port@2 {

				reg = <2>;

				funnel1_in_port2: endpoint {

					slave-mode;

					remote-endpoint = <&ptm6_out_port>;

				};

			};



			port@4 {

			port@3 {

				reg = <3>;

				funnel1_in_port3: endpoint {

					slave-mode;

					remote-endpoint = <&ptm7_out_port>;

				};

			};
@@ -599,48 +588,43 @@ 


		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			/* funnel output port */

			port@0 {

				reg = <0>;

		out-ports {

			port {

				funnel2_out_port0: endpoint {

					remote-endpoint =

						<&replicator2_in_port0>;

				};

			};

		};



			/* funnel input ports */

			port@1 {

		in-ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				funnel2_in_port0: endpoint {

					slave-mode;

					remote-endpoint = <&ptm8_out_port>;

				};

			};



			port@2 {

			port@1 {

				reg = <1>;

				funnel2_in_port1: endpoint {

					slave-mode;

					remote-endpoint = <&ptm9_out_port>;

				};

			};



			port@3 {

			port@2 {

				reg = <2>;

				funnel2_in_port2: endpoint {

					slave-mode;

					remote-endpoint = <&ptm10_out_port>;

				};

			};



			port@4 {

			port@3 {

				reg = <3>;

				funnel2_in_port3: endpoint {

					slave-mode;

					remote-endpoint = <&ptm11_out_port>;

				};

			};
@@ -653,48 +637,43 @@ 


		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			/* funnel output port */

			port@0 {

				reg = <0>;

		out-ports {

			port {

				funnel3_out_port0: endpoint {

					remote-endpoint =

						<&replicator3_in_port0>;

				};

			};

		};



			/* funnel input ports */

			port@1 {

		in-ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				funnel3_in_port0: endpoint {

					slave-mode;

					remote-endpoint = <&ptm12_out_port>;

				};

			};



			port@2 {

			port@1 {

				reg = <1>;

				funnel3_in_port1: endpoint {

					slave-mode;

					remote-endpoint = <&ptm13_out_port>;

				};

			};



			port@3 {

			port@2 {

				reg = <2>;

				funnel3_in_port2: endpoint {

					slave-mode;

					remote-endpoint = <&ptm14_out_port>;

				};

			};



			port@4 {

			port@3 {

				reg = <3>;

				funnel3_in_port3: endpoint {

					slave-mode;

					remote-endpoint = <&ptm15_out_port>;

				};

			};
@@ -707,50 +686,45 @@ 


		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			/* funnel output port */

			port@0 {

				reg = <0>;

		out-ports {

			port {

				funnel4_out_port0: endpoint {

					remote-endpoint = <&tpiu_in_port>;

				};

			};

		};



			/* funnel input ports */

			port@1 {

		in-ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				funnel4_in_port0: endpoint {

					slave-mode;

					remote-endpoint =

						<&replicator0_out_port1>;

				};

			};



			port@2 {

			port@1 {

				reg = <1>;

				funnel4_in_port1: endpoint {

					slave-mode;

					remote-endpoint =

						<&replicator1_out_port1>;

				};

			};



			port@3 {

			port@2 {

				reg = <2>;

				funnel4_in_port2: endpoint {

					slave-mode;

					remote-endpoint =

						<&replicator2_out_port1>;

				};

			};



			port@4 {

			port@3 {

				reg = <3>;

				funnel4_in_port3: endpoint {

					slave-mode;

					remote-endpoint =

						<&replicator3_out_port1>;

				};
@@ -765,12 +739,14 @@ 
		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		cpu = <&CPU0>;

		out-ports {

			port {

				ptm0_out_port: endpoint {

					remote-endpoint = <&funnel0_in_port0>;

				};

			};

		};

	};



	ptm@0,e3c7d000 {

		compatible = "arm,coresight-etm3x", "arm,primecell";
@@ -779,12 +755,14 @@ 
		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		cpu = <&CPU1>;

		out-ports {

			port {

				ptm1_out_port: endpoint {

					remote-endpoint = <&funnel0_in_port1>;

				};

			};

		};

	};



	ptm@0,e3c7e000 {

		compatible = "arm,coresight-etm3x", "arm,primecell";
@@ -793,12 +771,14 @@ 
		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		cpu = <&CPU2>;

		out-ports {

			port {

				ptm2_out_port: endpoint {

					remote-endpoint = <&funnel0_in_port2>;

				};

			};

		};

	};



	ptm@0,e3c7f000 {

		compatible = "arm,coresight-etm3x", "arm,primecell";
@@ -807,12 +787,14 @@ 
		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		cpu = <&CPU3>;

		out-ports {

			port {

				ptm3_out_port: endpoint {

					remote-endpoint = <&funnel0_in_port3>;

				};

			};

		};

	};



	ptm@0,e3cbc000 {

		compatible = "arm,coresight-etm3x", "arm,primecell";
@@ -821,12 +803,14 @@ 
		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		cpu = <&CPU4>;

		out-ports {

			port {

				ptm4_out_port: endpoint {

					remote-endpoint = <&funnel1_in_port0>;

				};

			};

		};

	};



	ptm@0,e3cbd000 {

		compatible = "arm,coresight-etm3x", "arm,primecell";
@@ -835,12 +819,14 @@ 
		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		cpu = <&CPU5>;

		out-ports {

			port {

				ptm5_out_port: endpoint {

					remote-endpoint = <&funnel1_in_port1>;

				};

			};

		};

	};



	ptm@0,e3cbe000 {

		compatible = "arm,coresight-etm3x", "arm,primecell";
@@ -849,12 +835,14 @@ 
		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		cpu = <&CPU6>;

		out-ports {

			port {

				ptm6_out_port: endpoint {

					remote-endpoint = <&funnel1_in_port2>;

				};

			};

		};

	};



	ptm@0,e3cbf000 {

		compatible = "arm,coresight-etm3x", "arm,primecell";
@@ -863,12 +851,14 @@ 
		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		cpu = <&CPU7>;

		out-ports {

			port {

				ptm7_out_port: endpoint {

					remote-endpoint = <&funnel1_in_port3>;

				};

			};

		};

	};



	ptm@0,e3cfc000 {

		compatible = "arm,coresight-etm3x", "arm,primecell";
@@ -877,12 +867,14 @@ 
		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		cpu = <&CPU8>;

		out-ports {

			port {

				ptm8_out_port: endpoint {

					remote-endpoint = <&funnel2_in_port0>;

				};

			};

		};

	};



	ptm@0,e3cfd000 {

		compatible = "arm,coresight-etm3x", "arm,primecell";
@@ -890,12 +882,14 @@ 
		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		cpu = <&CPU9>;

		out-ports {

			port {

				ptm9_out_port: endpoint {

					remote-endpoint = <&funnel2_in_port1>;

				};

			};

		};

	};



	ptm@0,e3cfe000 {

		compatible = "arm,coresight-etm3x", "arm,primecell";
@@ -904,12 +898,14 @@ 
		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		cpu = <&CPU10>;

		out-ports {

			port {

				ptm10_out_port: endpoint {

					remote-endpoint = <&funnel2_in_port2>;

				};

			};

		};

	};



	ptm@0,e3cff000 {

		compatible = "arm,coresight-etm3x", "arm,primecell";
@@ -918,12 +914,14 @@ 
		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		cpu = <&CPU11>;

		out-ports {

			port {

				ptm11_out_port: endpoint {

					remote-endpoint = <&funnel2_in_port3>;

				};

			};

		};

	};



	ptm@0,e3d3c000 {

		compatible = "arm,coresight-etm3x", "arm,primecell";
@@ -932,12 +930,14 @@ 
		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		cpu = <&CPU12>;

		out-ports {

			port {

				ptm12_out_port: endpoint {

					remote-endpoint = <&funnel3_in_port0>;

				};

			};

		};

	};



	ptm@0,e3d3d000 {

		compatible = "arm,coresight-etm3x", "arm,primecell";
@@ -946,12 +946,14 @@ 
		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		cpu = <&CPU13>;

		out-ports {

			port {

				ptm13_out_port: endpoint {

					remote-endpoint = <&funnel3_in_port1>;

				};

			};

		};

	};



	ptm@0,e3d3e000 {

		compatible = "arm,coresight-etm3x", "arm,primecell";
@@ -960,12 +962,14 @@ 
		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		cpu = <&CPU14>;

		out-ports {

			port {

				ptm14_out_port: endpoint {

					remote-endpoint = <&funnel3_in_port2>;

				};

			};

		};

	};



	ptm@0,e3d3f000 {

		compatible = "arm,coresight-etm3x", "arm,primecell";
@@ -974,6 +978,7 @@ 
		clocks = <&clk_375m>;

		clock-names = "apb_pclk";

		cpu = <&CPU15>;

		out-ports {

			port {

				ptm15_out_port: endpoint {

					remote-endpoint = <&funnel3_in_port3>;
@@ -981,3 +986,4 @@ 
			};

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE