Merge tag 'vexpress-updates-4.20' of... (11c99479) · Commits · 戴 / test

arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts

+49 −45

Original line number	Diff line number	Diff line
		@@ -393,13 +393,14 @@

		clocks = <&oscclk6a>;
		clock-names = "apb_pclk";
		in-ports {
		port {
		etb_in_port: endpoint {
		slave-mode;
		remote-endpoint = <&replicator_out_port0>;
		};
		};
		};
		};

		tpiu@20030000 {
		compatible = "arm,coresight-tpiu", "arm,primecell";
		@@ -407,13 +408,14 @@

		clocks = <&oscclk6a>;
		clock-names = "apb_pclk";
		in-ports {
		port {
		tpiu_in_port: endpoint {
		slave-mode;
		remote-endpoint = <&replicator_out_port1>;
		};
		};
		};
		};

		replicator {
		/* non-configurable replicators don't show up on the
		@@ -421,11 +423,10 @@
		*/
		compatible = "arm,coresight-replicator";

		ports {
		out-ports {
		#address-cells = <1>;
		#size-cells = <0>;

		/* replicator output ports */
		port@0 {
		reg = <0>;
		replicator_out_port0: endpoint {
		@@ -439,12 +440,11 @@
		remote-endpoint = <&tpiu_in_port>;
		};
		};
		};

		/* replicator input port */
		port@2 {
		reg = <0>;
		in-ports {
		port {
		replicator_in_port0: endpoint {
		slave-mode;
		remote-endpoint = <&funnel_out_port0>;
		};
		};
		@@ -457,40 +457,36 @@

		clocks = <&oscclk6a>;
		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 =
		<&replicator_in_port0>;
		};
		};
		};

		/* funnel input ports */
		port@1 {
		in-ports {
		#address-cells = <1>;
		#size-cells = <0>;

		port@0 {
		reg = <0>;
		funnel_in_port0: endpoint {
		slave-mode;
		remote-endpoint = <&ptm0_out_port>;
		};
		};

		port@2 {
		port@1 {
		reg = <1>;
		funnel_in_port1: endpoint {
		slave-mode;
		remote-endpoint = <&ptm1_out_port>;
		};
		};

		port@3 {
		port@2 {
		reg = <2>;
		funnel_in_port2: endpoint {
		slave-mode;
		remote-endpoint = <&etm0_out_port>;
		};
		};
		@@ -500,7 +496,6 @@
		port@4 {
		reg = <4>;
		funnel_in_port4: endpoint {
		slave-mode;
		remote-endpoint = <&etm1_out_port>;
		};
		};
		@@ -508,7 +503,6 @@
		port@5 {
		reg = <5>;
		funnel_in_port5: endpoint {
		slave-mode;
		remote-endpoint = <&etm2_out_port>;
		};
		};
		@@ -522,12 +516,14 @@
		cpu = <&cpu0>;
		clocks = <&oscclk6a>;
		clock-names = "apb_pclk";
		out-ports {
		port {
		ptm0_out_port: endpoint {
		remote-endpoint = <&funnel_in_port0>;
		};
		};
		};
		};

		ptm@2201d000 {
		compatible = "arm,coresight-etm3x", "arm,primecell";
		@@ -536,12 +532,14 @@
		cpu = <&cpu1>;
		clocks = <&oscclk6a>;
		clock-names = "apb_pclk";
		out-ports {
		port {
		ptm1_out_port: endpoint {
		remote-endpoint = <&funnel_in_port1>;
		};
		};
		};
		};

		etm@2203c000 {
		compatible = "arm,coresight-etm3x", "arm,primecell";
		@@ -550,12 +548,14 @@
		cpu = <&cpu2>;
		clocks = <&oscclk6a>;
		clock-names = "apb_pclk";
		out-ports {
		port {
		etm0_out_port: endpoint {
		remote-endpoint = <&funnel_in_port2>;
		};
		};
		};
		};

		etm@2203d000 {
		compatible = "arm,coresight-etm3x", "arm,primecell";
		@@ -564,12 +564,14 @@
		cpu = <&cpu3>;
		clocks = <&oscclk6a>;
		clock-names = "apb_pclk";
		out-ports {
		port {
		etm1_out_port: endpoint {
		remote-endpoint = <&funnel_in_port4>;
		};
		};
		};
		};

		etm@2203e000 {
		compatible = "arm,coresight-etm3x", "arm,primecell";
		@@ -578,12 +580,14 @@
		cpu = <&cpu4>;
		clocks = <&oscclk6a>;
		clock-names = "apb_pclk";
		out-ports {
		port {
		etm2_out_port: endpoint {
		remote-endpoint = <&funnel_in_port5>;
		};
		};
		};
		};

		smb: smb@8000000 {
		compatible = "simple-bus";

Admin message