Skip to content

Commit c8a9847

Browse files
LaurentiuM1234kartben
authored andcommitted
dts: xtensa: add imx8qm and imx8qxp DTSI variants
imx8qm and imx8qxp have a couple of differences regarding the peripheral address spaces and how the DT nodes are configured, which is why using a generic DTSI (nxp_imx8.dtsi) for the both of them is not right. One of the differences between the two, which affects Zephyr is the fact that irqstr's address space is different. Up until now this has been dealt with at the board level (i.e: imx8qxp_mek_mimx8qx6_adsp.dts), which is not right as this is not board-specific, but rather soc-specific. Additionally, this causes the following warning during compilation: "unit address and first address in 'reg' (0x51080000) don't match for /interrupt-controller@510a0000" To fix this, add two new DTSIs: nxp_imx8qm and nxp_imx8qxp. Each board (i.e: imx8qm_mek and imx8qxp_mek) will have to include the DTSI for their soc instead of the generic DTSI (i.e: nxp_imx8). Signed-off-by: Laurentiu Mihalcea <[email protected]>
1 parent 8a060ba commit c8a9847

File tree

5 files changed

+167
-79
lines changed

5 files changed

+167
-79
lines changed

boards/nxp/imx8qm_mek/imx8qm_mek_mimx8qm6_adsp.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
/dts-v1/;
88

9-
#include <nxp/nxp_imx8.dtsi>
9+
#include <nxp/nxp_imx8qm.dtsi>
1010
#include "imx8qm_mek_mimx8qm6_adsp-pinctrl.dtsi"
1111

1212
/ {

boards/nxp/imx8qxp_mek/imx8qxp_mek_mimx8qx6_adsp.dts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
/dts-v1/;
88

9-
#include <nxp/nxp_imx8.dtsi>
9+
#include <nxp/nxp_imx8qxp.dtsi>
1010
#include "imx8qxp_mek_mimx8qx6_adsp-pinctrl.dtsi"
1111

1212
/ {
@@ -31,7 +31,3 @@
3131
pinctrl-0 = <&sai1_default>;
3232
pinctrl-names = "default";
3333
};
34-
35-
&irqsteer {
36-
reg = <0x51080000 DT_SIZE_K(64)>;
37-
};

dts/xtensa/nxp/nxp_imx8.dtsi

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -32,79 +32,6 @@
3232
};
3333
};
3434

35-
irqsteer: interrupt-controller@510a0000 {
36-
compatible = "nxp,irqsteer-intc";
37-
reg = <0x510a0000 DT_SIZE_K(64)>;
38-
power-domains = <&irqstr_pd>;
39-
40-
#size-cells = <0>;
41-
#address-cells = <1>;
42-
43-
master0: interrupt-controller@0 {
44-
compatible = "nxp,irqsteer-master";
45-
reg = <0>;
46-
interrupt-controller;
47-
#interrupt-cells = <1>;
48-
interrupts-extended = <&clic 19 0 0>;
49-
};
50-
51-
master1: interrupt-controller@1 {
52-
compatible = "nxp,irqsteer-master";
53-
reg = <1>;
54-
interrupt-controller;
55-
#interrupt-cells = <1>;
56-
interrupts-extended = <&clic 20 0 0>;
57-
};
58-
59-
master2: interrupt-controller@2 {
60-
compatible = "nxp,irqsteer-master";
61-
reg = <2>;
62-
interrupt-controller;
63-
#interrupt-cells = <1>;
64-
interrupts-extended = <&clic 21 0 0>;
65-
};
66-
67-
master3: interrupt-controller@3 {
68-
compatible = "nxp,irqsteer-master";
69-
reg = <3>;
70-
interrupt-controller;
71-
#interrupt-cells = <1>;
72-
interrupts-extended = <&clic 22 0 0>;
73-
};
74-
75-
master4: interrupt-controller@4 {
76-
compatible = "nxp,irqsteer-master";
77-
reg = <4>;
78-
interrupt-controller;
79-
#interrupt-cells = <1>;
80-
interrupts-extended = <&clic 23 0 0>;
81-
};
82-
83-
master5: interrupt-controller@5 {
84-
compatible = "nxp,irqsteer-master";
85-
reg = <5>;
86-
interrupt-controller;
87-
#interrupt-cells = <1>;
88-
interrupts-extended = <&clic 24 0 0>;
89-
};
90-
91-
master6: interrupt-controller@6 {
92-
compatible = "nxp,irqsteer-master";
93-
reg = <6>;
94-
interrupt-controller;
95-
#interrupt-cells = <1>;
96-
interrupts-extended = <&clic 25 0 0>;
97-
};
98-
99-
master7: interrupt-controller@7 {
100-
compatible = "nxp,irqsteer-master";
101-
reg = <7>;
102-
interrupt-controller;
103-
#interrupt-cells = <1>;
104-
interrupts-extended = <&clic 26 0 0>;
105-
};
106-
};
107-
10835
sram0: memory@92400000 {
10936
device_type = "memory";
11037
compatible = "mmio-sram";

dts/xtensa/nxp/nxp_imx8qm.dtsi

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
/*
2+
* Copyright 2021, 2024 NXP
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
8+
#include <nxp/nxp_imx8.dtsi>
9+
10+
/ {
11+
irqsteer: interrupt-controller@510a0000 {
12+
compatible = "nxp,irqsteer-intc";
13+
reg = <0x510a0000 DT_SIZE_K(64)>;
14+
power-domains = <&irqstr_pd>;
15+
16+
#size-cells = <0>;
17+
#address-cells = <1>;
18+
19+
master0: interrupt-controller@0 {
20+
compatible = "nxp,irqsteer-master";
21+
reg = <0>;
22+
interrupt-controller;
23+
#interrupt-cells = <1>;
24+
interrupts-extended = <&clic 19 0 0>;
25+
};
26+
27+
master1: interrupt-controller@1 {
28+
compatible = "nxp,irqsteer-master";
29+
reg = <1>;
30+
interrupt-controller;
31+
#interrupt-cells = <1>;
32+
interrupts-extended = <&clic 20 0 0>;
33+
};
34+
35+
master2: interrupt-controller@2 {
36+
compatible = "nxp,irqsteer-master";
37+
reg = <2>;
38+
interrupt-controller;
39+
#interrupt-cells = <1>;
40+
interrupts-extended = <&clic 21 0 0>;
41+
};
42+
43+
master3: interrupt-controller@3 {
44+
compatible = "nxp,irqsteer-master";
45+
reg = <3>;
46+
interrupt-controller;
47+
#interrupt-cells = <1>;
48+
interrupts-extended = <&clic 22 0 0>;
49+
};
50+
51+
master4: interrupt-controller@4 {
52+
compatible = "nxp,irqsteer-master";
53+
reg = <4>;
54+
interrupt-controller;
55+
#interrupt-cells = <1>;
56+
interrupts-extended = <&clic 23 0 0>;
57+
};
58+
59+
master5: interrupt-controller@5 {
60+
compatible = "nxp,irqsteer-master";
61+
reg = <5>;
62+
interrupt-controller;
63+
#interrupt-cells = <1>;
64+
interrupts-extended = <&clic 24 0 0>;
65+
};
66+
67+
master6: interrupt-controller@6 {
68+
compatible = "nxp,irqsteer-master";
69+
reg = <6>;
70+
interrupt-controller;
71+
#interrupt-cells = <1>;
72+
interrupts-extended = <&clic 25 0 0>;
73+
};
74+
75+
master7: interrupt-controller@7 {
76+
compatible = "nxp,irqsteer-master";
77+
reg = <7>;
78+
interrupt-controller;
79+
#interrupt-cells = <1>;
80+
interrupts-extended = <&clic 26 0 0>;
81+
};
82+
};
83+
};

dts/xtensa/nxp/nxp_imx8qxp.dtsi

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
/*
2+
* Copyright 2021, 2024 NXP
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
#include <nxp/nxp_imx8.dtsi>
8+
9+
/ {
10+
irqsteer: interrupt-controller@51080000 {
11+
compatible = "nxp,irqsteer-intc";
12+
reg = <0x51080000 DT_SIZE_K(64)>;
13+
power-domains = <&irqstr_pd>;
14+
15+
#size-cells = <0>;
16+
#address-cells = <1>;
17+
18+
master0: interrupt-controller@0 {
19+
compatible = "nxp,irqsteer-master";
20+
reg = <0>;
21+
interrupt-controller;
22+
#interrupt-cells = <1>;
23+
interrupts-extended = <&clic 19 0 0>;
24+
};
25+
26+
master1: interrupt-controller@1 {
27+
compatible = "nxp,irqsteer-master";
28+
reg = <1>;
29+
interrupt-controller;
30+
#interrupt-cells = <1>;
31+
interrupts-extended = <&clic 20 0 0>;
32+
};
33+
34+
master2: interrupt-controller@2 {
35+
compatible = "nxp,irqsteer-master";
36+
reg = <2>;
37+
interrupt-controller;
38+
#interrupt-cells = <1>;
39+
interrupts-extended = <&clic 21 0 0>;
40+
};
41+
42+
master3: interrupt-controller@3 {
43+
compatible = "nxp,irqsteer-master";
44+
reg = <3>;
45+
interrupt-controller;
46+
#interrupt-cells = <1>;
47+
interrupts-extended = <&clic 22 0 0>;
48+
};
49+
50+
master4: interrupt-controller@4 {
51+
compatible = "nxp,irqsteer-master";
52+
reg = <4>;
53+
interrupt-controller;
54+
#interrupt-cells = <1>;
55+
interrupts-extended = <&clic 23 0 0>;
56+
};
57+
58+
master5: interrupt-controller@5 {
59+
compatible = "nxp,irqsteer-master";
60+
reg = <5>;
61+
interrupt-controller;
62+
#interrupt-cells = <1>;
63+
interrupts-extended = <&clic 24 0 0>;
64+
};
65+
66+
master6: interrupt-controller@6 {
67+
compatible = "nxp,irqsteer-master";
68+
reg = <6>;
69+
interrupt-controller;
70+
#interrupt-cells = <1>;
71+
interrupts-extended = <&clic 25 0 0>;
72+
};
73+
74+
master7: interrupt-controller@7 {
75+
compatible = "nxp,irqsteer-master";
76+
reg = <7>;
77+
interrupt-controller;
78+
#interrupt-cells = <1>;
79+
interrupts-extended = <&clic 26 0 0>;
80+
};
81+
};
82+
};

0 commit comments

Comments
 (0)