Skip to content

Commit 75430ab

Browse files
travis3630nordicjm
authored andcommitted
dts: common: nordic: move mramc dtsi
move mram-controller dtsi to secure peripherals as it is secure, bind compaitible of mram node to soc-nv-flash as to differentiate driver from nrf54h20. Signed-off-by: Travis Lam <[email protected]>
1 parent 9a45219 commit 75430ab

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

dts/common/nordic/nrf7120_enga.dtsi

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -817,28 +817,6 @@
817817
status = "disabled";
818818
};
819819

820-
mram_controller: mram-controller@0x5004e000 {
821-
compatible = "nordic,mram-controller";
822-
reg = <0x5004e000 0x1000>;
823-
#address-cells = <1>;
824-
#size-cells = <1>;
825-
interrupts = <78 NRF_DEFAULT_IRQ_PRIORITY>;
826-
827-
cpuapp_mram: mram@0 {
828-
compatible = "nordic,mram";
829-
reg = <0 DT_SIZE_K(3972)>;
830-
erase-block-size = <4096>;
831-
write-block-size = <4>;
832-
};
833-
834-
cpuflpr_mram: mram@3e1000 {
835-
compatible = "nordic,mram";
836-
reg = <0x3e1000 DT_SIZE_K(116)>;
837-
erase-block-size = <4096>;
838-
write-block-size = <4>;
839-
};
840-
};
841-
842820
cpuapp_ppb: cpuapp-ppb-bus {
843821
#address-cells = <1>;
844822
#size-cells = <1>;

dts/common/nordic/nrf7120_enga_secure_peripherals.dtsi

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,28 @@ kmu: kmu@49000 {
2121
status = "disabled";
2222
};
2323

24+
mram_controller: mram-controller@4e000 {
25+
compatible = "nordic,mram-controller";
26+
reg = <0x4e000 0x1000>;
27+
#address-cells = <1>;
28+
#size-cells = <1>;
29+
interrupts = <78 NRF_DEFAULT_IRQ_PRIORITY>;
30+
31+
cpuapp_mram: mram@0 {
32+
compatible = "soc-nv-flash";
33+
reg = <0 DT_SIZE_K(3972)>;
34+
erase-block-size = <4096>;
35+
write-block-size = <4>;
36+
};
37+
38+
cpuflpr_mram: mram@3e1000 {
39+
compatible = "soc-nv-flash";
40+
reg = <0x3e1000 DT_SIZE_K(116)>;
41+
erase-block-size = <4096>;
42+
write-block-size = <4>;
43+
};
44+
};
45+
2446
spu10: spu@80000 {
2547
compatible = "nordic,nrf-spu";
2648
reg = <0x80000 0x1000>;

0 commit comments

Comments
 (0)