Commit f1977a9b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next-for-4.21' of https://github.com/lyrazhang/linux into next/dt 

* 'next-for-4.21' of https://github.com/lyrazhang/linux

:
  arm64: dts: sc9836/sc9860: Update coresight bindings for hardware ports

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ccda4af0 1a9e7796

arch/arm64/boot/dts/sprd/sc9836.dtsi

+42 −36
Original line number Diff line number Diff line
@@ -50,68 +50,64 @@ etf@10003000 { 
		reg = <0 0x10003000 0 0x1000>;

		clocks = <&clk26mhz>;

		clock-names = "apb_pclk";

		in-ports {

			port {

				etf_in: endpoint {

				slave-mode;

					remote-endpoint = <&funnel_out_port0>;

				};

			};

		};

	};



	funnel@10001000 {

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

		reg = <0 0x10001000 0 0x1000>;

		clocks = <&clk26mhz>;

		clock-names = "apb_pclk";

		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			/* funnel output port */

			port@0 {

				reg = <0>;

		out-ports {

			port {

				funnel_out_port0: endpoint {

					remote-endpoint = <&etf_in>;

				};

			};

		};



			/* funnel input port 0-4 */

			port@1 {

		in-ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				funnel_in_port0: endpoint {

					slave-mode;

					remote-endpoint = <&etm0_out>;

				};

			};



			port@2 {

			port@1 {

				reg = <1>;

				funnel_in_port1: endpoint {

					slave-mode;

					remote-endpoint = <&etm1_out>;

				};

			};



			port@3 {

			port@2 {

				reg = <2>;

				funnel_in_port2: endpoint {

					slave-mode;

					remote-endpoint = <&etm2_out>;

				};

			};



			port@4 {

			port@3 {

				reg = <3>;

				funnel_in_port3: endpoint {

					slave-mode;

					remote-endpoint = <&etm3_out>;

				};

			};



			port@5 {

			port@4 {

				reg = <4>;

				funnel_in_port4: endpoint {

					slave-mode;

					remote-endpoint = <&stm_out>;

				};

			};
@@ -126,12 +122,14 @@ etm@10440000 { 
		cpu = <&cpu0>;

		clocks = <&clk26mhz>;

		clock-names = "apb_pclk";

		out-ports {

			port {

				etm0_out: endpoint {

					remote-endpoint = <&funnel_in_port0>;

				};

			};

		};

	};



	etm@10540000 {

		compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -140,12 +138,14 @@ etm@10540000 { 
		cpu = <&cpu1>;

		clocks = <&clk26mhz>;

		clock-names = "apb_pclk";

		out-ports {

			port {

				etm1_out: endpoint {

					remote-endpoint = <&funnel_in_port1>;

				};

			};

		};

	};



	etm@10640000 {

		compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -154,12 +154,14 @@ etm@10640000 { 
		cpu = <&cpu2>;

		clocks = <&clk26mhz>;

		clock-names = "apb_pclk";

		out-ports {

			port {

				etm2_out: endpoint {

					remote-endpoint = <&funnel_in_port2>;

				};

			};

		};

	};



	etm@10740000 {

		compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -168,12 +170,14 @@ etm@10740000 { 
		cpu = <&cpu3>;

		clocks = <&clk26mhz>;

		clock-names = "apb_pclk";

		out-ports {

			port {

				etm3_out: endpoint {

					remote-endpoint = <&funnel_in_port3>;

				};

			};

		};

	};



	stm@10006000 {

		compatible = "arm,coresight-stm", "arm,primecell";
@@ -182,12 +186,14 @@ stm@10006000 { 
		reg-names = "stm-base", "stm-stimulus-base";

		clocks = <&clk26mhz>;

		clock-names = "apb_pclk";

		out-ports {

			port {

				stm_out: endpoint {

					remote-endpoint = <&funnel_in_port4>;

				};

			};

		};

	};



	gic: interrupt-controller@12001000 {

		compatible = "arm,gic-400";

arch/arm64/boot/dts/sprd/sc9860.dtsi

+109 −106
Original line number Diff line number Diff line
@@ -304,30 +304,29 @@ funnel@10001000 { /* SoC Funnel */ 
			reg = <0 0x10001000 0 0x1000>;

			clocks = <&ext_26m>;

			clock-names = "apb_pclk";

			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

			out-ports {

				port {

					soc_funnel_out_port: endpoint {

						remote-endpoint = <&etb_in>;

					};

				};

			};



				port@1 {

			in-ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

					soc_funnel_in_port0: endpoint {

						slave-mode;

						remote-endpoint =

						<&main_funnel_out_port>;

					};

				};



				port@2 {

				port@4 {

					reg = <4>;

					soc_funnel_in_port1: endpoint {

						slave-mode;

						remote-endpoint =

							<&stm_out_port>;

					};
@@ -340,14 +339,15 @@ etb@10003000 { 
			reg = <0 0x10003000 0 0x1000>;

			clocks = <&ext_26m>;

			clock-names = "apb_pclk";

			out-ports {

				port {

					etb_in: endpoint {

					slave-mode;

						remote-endpoint =

							<&soc_funnel_out_port>;

					};

				};

			};

		};



		stm@10006000 {

			compatible = "arm,coresight-stm", "arm,primecell";
@@ -356,6 +356,7 @@ stm@10006000 { 
			reg-names = "stm-base", "stm-stimulus-base";

			clocks = <&ext_26m>;

			clock-names = "apb_pclk";

			out-ports {

				port {

					stm_out_port: endpoint {

						remote-endpoint =
@@ -363,44 +364,43 @@ stm_out_port: endpoint { 
					};

				};

			};

		};



		funnel@11001000 { /* Cluster0 Funnel */

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

			reg = <0 0x11001000 0 0x1000>;

			clocks = <&ext_26m>;

			clock-names = "apb_pclk";

			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

			out-ports {

				port {

					cluster0_funnel_out_port: endpoint {

						remote-endpoint =

							<&cluster0_etf_in>;

					};

				};

			};



				port@1 {

			in-ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

					cluster0_funnel_in_port0: endpoint {

						slave-mode;

						remote-endpoint = <&etm0_out>;

					};

				};



				port@2 {

				port@1 {

					reg = <1>;

					cluster0_funnel_in_port1: endpoint {

						slave-mode;

						remote-endpoint = <&etm1_out>;

					};

				};



				port@3 {

				port@2 {

					reg = <2>;

					cluster0_funnel_in_port2: endpoint {

						slave-mode;

						remote-endpoint = <&etm2_out>;

					};

				};
@@ -408,7 +408,6 @@ cluster0_funnel_in_port2: endpoint { 
				port@4 {

					reg = <4>;

					cluster0_funnel_in_port3: endpoint {

						slave-mode;

						remote-endpoint = <&etm3_out>;

					};

				};
@@ -420,46 +419,43 @@ funnel@11002000 { /* Cluster1 Funnel */ 
			reg = <0 0x11002000 0 0x1000>;

			clocks = <&ext_26m>;

			clock-names = "apb_pclk";

			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

			out-ports {

				port {

					cluster1_funnel_out_port: endpoint {

						remote-endpoint =

							<&cluster1_etf_in>;

					};

				};

			};



				port@1 {

			in-ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

					cluster1_funnel_in_port0: endpoint {

						slave-mode;

						remote-endpoint = <&etm4_out>;

					};

				};



				port@2 {

				port@1 {

					reg = <1>;

					cluster1_funnel_in_port1: endpoint {

						slave-mode;

						remote-endpoint = <&etm5_out>;

					};

				};



				port@3 {

				port@2 {

					reg = <2>;

					cluster1_funnel_in_port2: endpoint {

						slave-mode;

						remote-endpoint = <&etm6_out>;

					};

				};



				port@4 {

				port@3 {

					reg = <3>;

					cluster1_funnel_in_port3: endpoint {

						slave-mode;

						remote-endpoint = <&etm7_out>;

					};

				};
@@ -472,22 +468,18 @@ etf@11003000 { /* ETF on Cluster0 */ 
			clocks = <&ext_26m>;

			clock-names = "apb_pclk";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

			out-ports {

				port {

					cluster0_etf_out: endpoint {

						remote-endpoint =

						<&main_funnel_in_port0>;

					};

				};

			};



				port@1 {

					reg = <0>;

			in-ports {

				port {

					cluster0_etf_in: endpoint {

						slave-mode;

						remote-endpoint =

						<&cluster0_funnel_out_port>;

					};
@@ -501,22 +493,18 @@ etf@11004000 { /* ETF on Cluster1 */ 
			clocks = <&ext_26m>;

			clock-names = "apb_pclk";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

			out-ports {

				port {

					cluster1_etf_out: endpoint {

						remote-endpoint =

						<&main_funnel_in_port1>;

					};

				};

			};



				port@1 {

					reg = <0>;

			in-ports {

				port {

					cluster1_etf_in: endpoint {

						slave-mode;

						remote-endpoint =

						<&cluster1_funnel_out_port>;

					};
@@ -530,31 +518,30 @@ funnel@11005000 { /* Main Funnel */ 
			clocks = <&ext_26m>;

			clock-names = "apb_pclk";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

			out-ports {

				port {

					main_funnel_out_port: endpoint {

						remote-endpoint =

							<&soc_funnel_in_port0>;

					};

				};

			};



				port@1 {

			in-ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

					main_funnel_in_port0: endpoint {

						slave-mode;

						remote-endpoint =

							<&cluster0_etf_out>;

					};

				};



				port@2 {

				port@1 {

					reg = <1>;

					main_funnel_in_port1: endpoint {

						slave-mode;

						remote-endpoint =

							<&cluster1_etf_out>;

					};
@@ -569,6 +556,7 @@ etm@11440000 { 
			clocks = <&ext_26m>;

			clock-names = "apb_pclk";



			out-ports {

				port {

					etm0_out: endpoint {

						remote-endpoint =
@@ -576,6 +564,7 @@ etm0_out: endpoint { 
					};

				};

			};

		};



		etm@11540000 {

			compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -584,6 +573,7 @@ etm@11540000 { 
			clocks = <&ext_26m>;

			clock-names = "apb_pclk";



			out-ports {

				port {

					etm1_out: endpoint {

						remote-endpoint =
@@ -591,6 +581,7 @@ etm1_out: endpoint { 
					};

				};

			};

		};



		etm@11640000 {

			compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -599,6 +590,7 @@ etm@11640000 { 
			clocks = <&ext_26m>;

			clock-names = "apb_pclk";



			out-ports {

				port {

					etm2_out: endpoint {

						remote-endpoint =
@@ -606,6 +598,7 @@ etm2_out: endpoint { 
					};

				};

			};

		};



		etm@11740000 {

			compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -614,6 +607,7 @@ etm@11740000 { 
			clocks = <&ext_26m>;

			clock-names = "apb_pclk";



			out-ports {

				port {

					etm3_out: endpoint {

						remote-endpoint =
@@ -621,6 +615,7 @@ etm3_out: endpoint { 
					};

				};

			};

		};



		etm@11840000 {

			compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -629,6 +624,7 @@ etm@11840000 { 
			clocks = <&ext_26m>;

			clock-names = "apb_pclk";



			out-ports {

				port {

					etm4_out: endpoint {

						remote-endpoint =
@@ -636,6 +632,7 @@ etm4_out: endpoint { 
					};

				};

			};

		};



		etm@11940000 {

			compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -644,6 +641,7 @@ etm@11940000 { 
			clocks = <&ext_26m>;

			clock-names = "apb_pclk";



			out-ports {

				port {

					etm5_out: endpoint {

						remote-endpoint =
@@ -651,6 +649,7 @@ etm5_out: endpoint { 
					};

				};

			};

		};



		etm@11a40000 {

			compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -659,6 +658,7 @@ etm@11a40000 { 
			clocks = <&ext_26m>;

			clock-names = "apb_pclk";



			out-ports {

				port {

					etm6_out: endpoint {

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

				};

			};

		};



		etm@11b40000 {

			compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -674,6 +675,7 @@ etm@11b40000 { 
			clocks = <&ext_26m>;

			clock-names = "apb_pclk";



			out-ports {

				port {

					etm7_out: endpoint {

						remote-endpoint =
@@ -681,6 +683,7 @@ etm7_out: endpoint { 
					};

				};

			};

		};



		gpio-keys {

			compatible = "gpio-keys";