diff options
| author | Alexander Stein <alexander.stein@ew.tq-group.com> | 2023-10-12 10:15:53 +0200 | 
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2023-11-27 09:47:40 +0800 | 
| commit | 0d4ac04fa7c3f6dc263dba6f575a2ec7a2d4eca8 (patch) | |
| tree | 0aae824d18c90dfeaf2476c09bb45d690cc1dc73 | |
| parent | b85ea95d086471afb4ad062012a4d73cd328fa86 (diff) | |
ARM: dts: imx7d: Fix coresight funnel ports
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>
| -rw-r--r-- | arch/arm/boot/dts/nxp/imx/imx7d.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/nxp/imx/imx7s.dtsi | 6 | 
2 files changed, 5 insertions, 4 deletions
| diff --git a/arch/arm/boot/dts/nxp/imx/imx7d.dtsi b/arch/arm/boot/dts/nxp/imx/imx7d.dtsi index 4b94b8afb55d..0484e349e064 100644 --- a/arch/arm/boot/dts/nxp/imx/imx7d.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx7d.dtsi @@ -217,9 +217,6 @@  };  &ca_funnel_in_ports { -	#address-cells = <1>; -	#size-cells = <0>; -  	port@1 {  		reg = <1>;  		ca_funnel_in_port1: endpoint { diff --git a/arch/arm/boot/dts/nxp/imx/imx7s.dtsi b/arch/arm/boot/dts/nxp/imx/imx7s.dtsi index 29b8fd03567a..8e05ab545213 100644 --- a/arch/arm/boot/dts/nxp/imx/imx7s.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx7s.dtsi @@ -190,7 +190,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>;  					}; | 
