Skip to content

Commit 0d4ac04

Browse files
tq-steinaShawn Guo
authored andcommitted
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 <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
1 parent b85ea95 commit 0d4ac04

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

arch/arm/boot/dts/nxp/imx/imx7d.dtsi

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,6 @@
217217
};
218218

219219
&ca_funnel_in_ports {
220-
#address-cells = <1>;
221-
#size-cells = <0>;
222-
223220
port@1 {
224221
reg = <1>;
225222
ca_funnel_in_port1: endpoint {

arch/arm/boot/dts/nxp/imx/imx7s.dtsi

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,11 @@
190190
clock-names = "apb_pclk";
191191

192192
ca_funnel_in_ports: in-ports {
193-
port {
193+
#address-cells = <1>;
194+
#size-cells = <0>;
195+
196+
port@0 {
197+
reg = <0>;
194198
ca_funnel_in_port0: endpoint {
195199
remote-endpoint = <&etm0_out_port>;
196200
};

0 commit comments

Comments
 (0)