Skip to content

Commit fa2240b

Browse files
57300nashif
authored andcommitted
dts: nordic: nrf54h20: Fix PPR CLIC address
Between SoC revisions, the address was moved from 0x5F909000 in the global domain, to 0xF0000000 in PPR's private address space. Move the corresponding DT node out of `cpuppr_vpr` range to a separate bus node, which is considered inaccessible to all cores but `cpuppr`. This is expressed by selectively leaving out the `simple-bus` compatible and `ranges` property, i.e., they're only set in `nrf54h20_cpuppr.dtsi`. This lets the interrupt controller node remain visible at system level, for the purpose of describing IRQ mappings between cores in devicetree. Signed-off-by: Grzegorz Swiderski <[email protected]>
1 parent a6b409f commit fa2240b

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

dts/common/nordic/nrf54h20.dtsi

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@
591591
cpu = <13>;
592592
#address-cells = <1>;
593593
#size-cells = <1>;
594-
ranges = <0x0 0x908000 0x4000>;
594+
ranges = <0x0 0x908000 0x1000>;
595595

596596
cpuppr_vevif_tx: mailbox@0 {
597597
compatible = "nordic,nrf-vevif-task-tx";
@@ -601,15 +601,6 @@
601601
nordic,tasks = <16>;
602602
nordic,tasks-mask = <0xfffffff0>;
603603
};
604-
605-
cpuppr_clic: interrupt-controller@1000 {
606-
compatible = "nordic,nrf-clic";
607-
reg = <0x1000 0x3000>;
608-
status = "disabled";
609-
#interrupt-cells = <2>;
610-
interrupt-controller;
611-
#address-cells = <1>;
612-
};
613604
};
614605

615606
ipct130: ipct@921000 {
@@ -1219,6 +1210,20 @@
12191210
};
12201211
};
12211212

1213+
cpuppr_private: cpuppr-private-bus {
1214+
#address-cells = <1>;
1215+
#size-cells = <1>;
1216+
1217+
cpuppr_clic: interrupt-controller@f0000000 {
1218+
compatible = "nordic,nrf-clic";
1219+
reg = <0xf0000000 0x3000>;
1220+
status = "disabled";
1221+
#interrupt-cells = <2>;
1222+
interrupt-controller;
1223+
#address-cells = <1>;
1224+
};
1225+
};
1226+
12221227
cpuflpr_private: cpuflpr-private-bus {
12231228
#address-cells = <1>;
12241229
#size-cells = <1>;

dts/riscv/nordic/nrf54h20_cpuppr.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ cpusys_vevif: &cpusys_vevif_tx {};
3030
};
3131
};
3232

33+
&cpuppr_private {
34+
compatible = "simple-bus";
35+
ranges;
36+
};
37+
3338
&cpuppr_clic {
3439
status = "okay";
3540
};

0 commit comments

Comments
 (0)