Skip to content

Commit

Permalink
[nrf fromlist] dts: nordic: nrf54h20_enga: add PPR VEVIF nodes
Browse files Browse the repository at this point in the history
Add a new nodes for PPR's VEVIF. In app cores, VEVIF registers are part
of the VPR peripheral, so it is exposed as a child node (since it
requires its own properties, eg #mbox-cells). In VPR, it's a CPU child
since it's not a memory-mapped peripheral, but used with CSRs.

Upstream PR: zephyrproject-rtos/zephyr#69303

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 901708525cd5fdeabdea78d3272c2639d796c0d0)
(cherry picked from commit 743cc86)
(cherry picked from commit eb64ac1)
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
  • Loading branch information
gmarull authored and rlubos committed Mar 14, 2024
1 parent a4b9f78 commit 0df73af
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 0 deletions.
1 change: 1 addition & 0 deletions dts/arm/nordic/nrf54h20_enga_cpuapp.dtsi
Expand Up @@ -9,6 +9,7 @@
cpu: &cpuapp {};
systick: &cpuapp_systick {};
nvic: &cpuapp_nvic {};
cpuppr_vevif: &cpuppr_vevif_remote {};

/delete-node/ &cpuppr;
/delete-node/ &cpurad;
Expand Down
1 change: 1 addition & 0 deletions dts/arm/nordic/nrf54h20_enga_cpurad.dtsi
Expand Up @@ -9,6 +9,7 @@
cpu: &cpurad {};
systick: &cpurad_systick {};
nvic: &cpurad_nvic {};
cpuppr_vevif: &cpuppr_vevif_remote {};

/delete-node/ &cpuapp;
/delete-node/ &cpuapp_peripherals;
Expand Down
34 changes: 34 additions & 0 deletions dts/common/nordic/nrf54h20_enga.dtsi
Expand Up @@ -40,6 +40,31 @@
clock-frequency = <DT_FREQ_M(16)>;
riscv,isa = "rv32emc";
nordic,bus-width = <32>;

cpuppr_vevif_local: mailbox {
compatible = "nordic,nrf-vevif-local";
status = "disabled";
interrupt-parent = <&cpuppr_clic>;
interrupts = <0 NRF_DEFAULT_IRQ_PRIORITY>,
<1 NRF_DEFAULT_IRQ_PRIORITY>,
<2 NRF_DEFAULT_IRQ_PRIORITY>,
<3 NRF_DEFAULT_IRQ_PRIORITY>,
<4 NRF_DEFAULT_IRQ_PRIORITY>,
<5 NRF_DEFAULT_IRQ_PRIORITY>,
<6 NRF_DEFAULT_IRQ_PRIORITY>,
<7 NRF_DEFAULT_IRQ_PRIORITY>,
<8 NRF_DEFAULT_IRQ_PRIORITY>,
<9 NRF_DEFAULT_IRQ_PRIORITY>,
<10 NRF_DEFAULT_IRQ_PRIORITY>,
<11 NRF_DEFAULT_IRQ_PRIORITY>,
<12 NRF_DEFAULT_IRQ_PRIORITY>,
<13 NRF_DEFAULT_IRQ_PRIORITY>,
<14 NRF_DEFAULT_IRQ_PRIORITY>,
<15 NRF_DEFAULT_IRQ_PRIORITY>;
#mbox-cells = <1>;
nordic,tasks = <16>;
nordic,tasks-mask = <0xfffffff0>;
};
};
};

Expand Down Expand Up @@ -299,6 +324,15 @@
#size-cells = <1>;
ranges = <0x0 0x908000 0x4000>;

cpuppr_vevif_remote: mailbox@0 {
compatible = "nordic,nrf-vevif-remote";
reg = <0x0 0x1000>;
status = "disabled";
#mbox-cells = <1>;
nordic,tasks = <16>;
nordic,tasks-mask = <0xfffffff0>;
};

cpuppr_clic: interrupt-controller@1000 {
compatible = "nordic,nrf-clic";
reg = <0x1000 0x3000>;
Expand Down
1 change: 1 addition & 0 deletions dts/riscv/nordic/nrf54h20_enga_cpuppr.dtsi
Expand Up @@ -8,6 +8,7 @@

cpu: &cpuppr {};
clic: &cpuppr_clic {};
cpuppr_vevif: &cpuppr_vevif_local {};

/delete-node/ &cpuapp;
/delete-node/ &cpuapp_peripherals;
Expand Down

0 comments on commit 0df73af

Please sign in to comment.