Commit 183edc0a authored Oct 12, 2023 by Alexander Stein Committed by Greg Kroah-Hartman Feb 23, 2024

ARM: dts: imx7d: Fix coresight funnel ports



[ Upstream commit 0d4ac04fa7c3f6dc263dba6f575a2ec7a2d4eca8 ]

imx7d uses two ports for 'in-ports', so the syntax port@<num> has to
be used. imx7d has both port and port@1 nodes present, raising these
error:
funnel@30041000: in-ports: More than one condition true in oneOf schema
funnel@30041000: Unevaluated properties are not allowed
('in-ports' was unexpected)

Fix this by also using port@0 for imx7s as well.

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 6c50e561

arch/arm/boot/dts/imx7d.dtsi

+0 −3

Original line number	Diff line number	Diff line
		@@ -204,9 +204,6 @@
		};

		&ca_funnel_in_ports {
		#address-cells = <1>;
		#size-cells = <0>;

		port@1 {
		reg = <1>;
		ca_funnel_in_port1: endpoint {

arch/arm/boot/dts/imx7s.dtsi

+5 −1

Original line number	Diff line number	Diff line
		@@ -183,7 +183,11 @@
		clock-names = "apb_pclk";

		ca_funnel_in_ports: in-ports {
		port {
		#address-cells = <1>;
		#size-cells = <0>;

		port@0 {
		reg = <0>;
		ca_funnel_in_port0: endpoint {
		remote-endpoint = <&etm0_out_port>;
		};