Commit 6302cbe7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'juno-updates-4.20' of... 

Merge tag 'juno-updates-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/dt

ARMv8 Juno/Vexpress updates for v4.20

1. Enablement of scatter gather mode for CoreSight TMC-ETR routing

2. Usage of updated coresight graph bindings that eliminates loads of
   dtc warnings

* tag 'juno-updates-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux

:
  arm64: dts: juno: Enable coresight tmc scatter gather in ETR
  arm64: dts: juno: Update entries to match latest coresight bindings

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents b610209c 79daf2a4

arch/arm64/boot/dts/arm/juno-base.dtsi

+83 −79
Original line number Diff line number Diff line
@@ -115,22 +115,17 @@ etf@20010000 { /* etf0 */ 
		clocks = <&soc_smc50mhz>;

		clock-names = "apb_pclk";

		power-domains = <&scpi_devpd 0>;

		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			/* input port */

			port@0 {

				reg = <0>;

		in-ports {

			port {

				etf0_in_port: endpoint {

					slave-mode;

					remote-endpoint = <&main_funnel_out_port>;

				};

			};

		};



			/* output port */

			port@1 {

				reg = <0>;

		out-ports {

			port {

				etf0_out_port: endpoint {

				};

			};
@@ -144,13 +139,14 @@ tpiu@20030000 { 
		clocks = <&soc_smc50mhz>;

		clock-names = "apb_pclk";

		power-domains = <&scpi_devpd 0>;

		in-ports {

			port {

				tpiu_in_port: endpoint {

				slave-mode;

					remote-endpoint = <&replicator_out_port0>;

				};

			};

		};

	};



	/* main funnel on Juno r0, cssys0 funnel on Juno r1/r2 as per TRM*/

	main_funnel: funnel@20040000 {
@@ -160,31 +156,29 @@ main_funnel: funnel@20040000 { 
		clocks = <&soc_smc50mhz>;

		clock-names = "apb_pclk";

		power-domains = <&scpi_devpd 0>;

		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			/* output port */

			port@0 {

				reg = <0>;

		out-ports {

			port {

				main_funnel_out_port: endpoint {

					remote-endpoint = <&etf0_in_port>;

				};

			};

		};



			/* input ports */

			port@1 {

		main_funnel_in_ports: in-ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				main_funnel_in_port0: endpoint {

					slave-mode;

					remote-endpoint = <&cluster0_funnel_out_port>;

				};

			};



			port@2 {

			port@1 {

				reg = <1>;

				main_funnel_in_port1: endpoint {

					slave-mode;

					remote-endpoint = <&cluster1_funnel_out_port>;

				};

			};
@@ -199,13 +193,15 @@ etr@20070000 { 
		clocks = <&soc_smc50mhz>;

		clock-names = "apb_pclk";

		power-domains = <&scpi_devpd 0>;

		arm,scatter-gather;

		in-ports {

			port {

				etr_in_port: endpoint {

				slave-mode;

					remote-endpoint = <&replicator_out_port1>;

				};

			};

		};

	};



	stm@20100000 {

		compatible = "arm,coresight-stm", "arm,primecell";
@@ -216,11 +212,13 @@ stm@20100000 { 
		clocks = <&soc_smc50mhz>;

		clock-names = "apb_pclk";

		power-domains = <&scpi_devpd 0>;

		out-ports {

			port {

				stm_out_port: endpoint {

				};

			};

		};

	};



	cpu_debug0: cpu-debug@22010000 {

		compatible = "arm,coresight-cpu-debug", "arm,primecell";
@@ -238,12 +236,14 @@ etm0: etm@22040000 { 
		clocks = <&soc_smc50mhz>;

		clock-names = "apb_pclk";

		power-domains = <&scpi_devpd 0>;

		out-ports {

			port {

				cluster0_etm0_out_port: endpoint {

					remote-endpoint = <&cluster0_funnel_in_port0>;

				};

			};

		};

	};



	funnel@220c0000 { /* cluster0 funnel */

		compatible = "arm,coresight-funnel", "arm,primecell";
@@ -252,29 +252,28 @@ funnel@220c0000 { /* cluster0 funnel */ 
		clocks = <&soc_smc50mhz>;

		clock-names = "apb_pclk";

		power-domains = <&scpi_devpd 0>;

		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

		out-ports {

			port {

				cluster0_funnel_out_port: endpoint {

					remote-endpoint = <&main_funnel_in_port0>;

				};

			};

		};



			port@1 {

		in-ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				cluster0_funnel_in_port0: endpoint {

					slave-mode;

					remote-endpoint = <&cluster0_etm0_out_port>;

				};

			};



			port@2 {

			port@1 {

				reg = <1>;

				cluster0_funnel_in_port1: endpoint {

					slave-mode;

					remote-endpoint = <&cluster0_etm1_out_port>;

				};

			};
@@ -297,12 +296,14 @@ etm1: etm@22140000 { 
		clocks = <&soc_smc50mhz>;

		clock-names = "apb_pclk";

		power-domains = <&scpi_devpd 0>;

		out-ports {

			port {

				cluster0_etm1_out_port: endpoint {

					remote-endpoint = <&cluster0_funnel_in_port1>;

				};

			};

		};

	};



	cpu_debug2: cpu-debug@23010000 {

		compatible = "arm,coresight-cpu-debug", "arm,primecell";
@@ -320,12 +321,14 @@ etm2: etm@23040000 { 
		clocks = <&soc_smc50mhz>;

		clock-names = "apb_pclk";

		power-domains = <&scpi_devpd 0>;

		out-ports {

			port {

				cluster1_etm0_out_port: endpoint {

					remote-endpoint = <&cluster1_funnel_in_port0>;

				};

			};

		};

	};



	funnel@230c0000 { /* cluster1 funnel */

		compatible = "arm,coresight-funnel", "arm,primecell";
@@ -334,43 +337,40 @@ funnel@230c0000 { /* cluster1 funnel */ 
		clocks = <&soc_smc50mhz>;

		clock-names = "apb_pclk";

		power-domains = <&scpi_devpd 0>;

		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

		out-ports {

			port {

				cluster1_funnel_out_port: endpoint {

					remote-endpoint = <&main_funnel_in_port1>;

				};

			};

		};



			port@1 {

		in-ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				cluster1_funnel_in_port0: endpoint {

					slave-mode;

					remote-endpoint = <&cluster1_etm0_out_port>;

				};

			};



			port@2 {

			port@1 {

				reg = <1>;

				cluster1_funnel_in_port1: endpoint {

					slave-mode;

					remote-endpoint = <&cluster1_etm1_out_port>;

				};

			};

			port@3 {

			port@2 {

				reg = <2>;

				cluster1_funnel_in_port2: endpoint {

					slave-mode;

					remote-endpoint = <&cluster1_etm2_out_port>;

				};

			};

			port@4 {

			port@3 {

				reg = <3>;

				cluster1_funnel_in_port3: endpoint {

					slave-mode;

					remote-endpoint = <&cluster1_etm3_out_port>;

				};

			};
@@ -393,12 +393,14 @@ etm3: etm@23140000 { 
		clocks = <&soc_smc50mhz>;

		clock-names = "apb_pclk";

		power-domains = <&scpi_devpd 0>;

		out-ports {

			port {

				cluster1_etm1_out_port: endpoint {

					remote-endpoint = <&cluster1_funnel_in_port1>;

				};

			};

		};

	};



	cpu_debug4: cpu-debug@23210000 {

		compatible = "arm,coresight-cpu-debug", "arm,primecell";
@@ -416,12 +418,14 @@ etm4: etm@23240000 { 
		clocks = <&soc_smc50mhz>;

		clock-names = "apb_pclk";

		power-domains = <&scpi_devpd 0>;

		out-ports {

			port {

				cluster1_etm2_out_port: endpoint {

					remote-endpoint = <&cluster1_funnel_in_port2>;

				};

			};

		};

	};



	cpu_debug5: cpu-debug@23310000 {

		compatible = "arm,coresight-cpu-debug", "arm,primecell";
@@ -439,12 +443,14 @@ etm5: etm@23340000 { 
		clocks = <&soc_smc50mhz>;

		clock-names = "apb_pclk";

		power-domains = <&scpi_devpd 0>;

		out-ports {

			port {

				cluster1_etm3_out_port: endpoint {

					remote-endpoint = <&cluster1_funnel_in_port3>;

				};

			};

		};

	};



	replicator@20120000 {

		compatible = "arm,coresight-dynamic-replicator", "arm,primecell";
@@ -454,7 +460,7 @@ replicator@20120000 { 
		clock-names = "apb_pclk";

		power-domains = <&scpi_devpd 0>;



		ports {

		out-ports {

			#address-cells = <1>;

			#size-cells = <0>;
@@ -472,12 +478,10 @@ replicator_out_port1: endpoint { 
					remote-endpoint = <&etr_in_port>;

				};

			};



			/* replicator input port */

			port@2 {

				reg = <0>;

		};

		in-ports {

			port {

				replicator_in_port0: endpoint {

					slave-mode;

				};

			};

		};

arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi

+18 −34
Original line number Diff line number Diff line
@@ -7,23 +7,16 @@ funnel@20130000 { /* cssys1 */ 
		clocks = <&soc_smc50mhz>;

		clock-names = "apb_pclk";

		power-domains = <&scpi_devpd 0>;

		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			/* output port */

			port@0 {

				reg = <0>;

		out-ports {

			port {

				csys1_funnel_out_port: endpoint {

					remote-endpoint = <&etf1_in_port>;

				};

			};



			/* input port */

			port@1 {

				reg = <0>;

		};

		in-ports {

			port {

				csys1_funnel_in_port0: endpoint {

					slave-mode;

				};

			};
@@ -37,22 +30,15 @@ etf@20140000 { /* etf1 */ 
		clocks = <&soc_smc50mhz>;

		clock-names = "apb_pclk";

		power-domains = <&scpi_devpd 0>;

		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			/* input port */

			port@0 {

				reg = <0>;

		in-ports {

			port {

				etf1_in_port: endpoint {

					slave-mode;

					remote-endpoint = <&csys1_funnel_out_port>;

				};

			};



			/* output port */

			port@1 {

				reg = <0>;

		};

		out-ports {

			port {

				etf1_out_port: endpoint {

					remote-endpoint = <&csys2_funnel_in_port1>;

				};
@@ -67,20 +53,18 @@ funnel@20150000 { /* cssys2 */ 
		clocks = <&soc_smc50mhz>;

		clock-names = "apb_pclk";

		power-domains = <&scpi_devpd 0>;

		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			/* output port */

			port@0 {

				reg = <0>;

		out-ports {

			port {

				csys2_funnel_out_port: endpoint {

					remote-endpoint = <&replicator_in_port0>;

				};

			};

		};



			/* input ports */

			port@1 {

		in-ports {

			#address-cells = <1>;

			#size-cells = <0>;

			port@0 {

				reg = <0>;

				csys2_funnel_in_port0: endpoint {

					slave-mode;
@@ -88,7 +72,7 @@ csys2_funnel_in_port0: endpoint { 
				};

			};



			port@2 {

			port@1 {

				reg = <1>;

				csys2_funnel_in_port1: endpoint {

					slave-mode;

arch/arm64/boot/dts/arm/juno.dts

+5 −8
Original line number Diff line number Diff line
@@ -257,17 +257,14 @@ &stm_out_port { 
	remote-endpoint = <&main_funnel_in_port2>;

};



&main_funnel {

	ports {

		port@3 {

&main_funnel_in_ports {

	port@2 {

		reg = <2>;

		main_funnel_in_port2: endpoint {

				slave-mode;

			remote-endpoint = <&stm_out_port>;

		};

	};

};

};



&cpu_debug0 {

	cpu = <&A57_0>;