Skip to content

Commit 0eab341

Browse files
committed
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 2123118 commit 0eab341

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

cmake/sysbuild/partition_manager.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ foreach(d APP ${PM_DOMAINS})
539539
set(soc_nvs_controller_driver_kc CONFIG_SOC_FLASH_NRF_RRAM)
540540
elseif(${image_name}_CONFIG_SOC_SERIES_NRF71X)
541541
set(soc_nvs_controller mram_controller)
542-
set(soc_nvs_controller_driver_kc CONFIG_SOC_FLASH_NRF_MRAM)
542+
set(soc_nvs_controller_driver_kc CONFIG_SOC_FLASH_NRF_MRAMC)
543543
else()
544544
set(soc_nvs_controller flash_controller)
545545
set(soc_nvs_controller_driver_kc CONFIG_SOC_FLASH_NRF)

dts/common/nordic/nrf7120_enga.dtsi

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -812,28 +812,6 @@
812812
status = "disabled";
813813
};
814814

815-
mram_controller: mram-controller@0x5004e000 {
816-
compatible = "nordic,mram-controller";
817-
reg = <0x5004e000 0x1000>;
818-
#address-cells = <1>;
819-
#size-cells = <1>;
820-
interrupts = <78 NRF_DEFAULT_IRQ_PRIORITY>;
821-
822-
cpuapp_mram: mram@0 {
823-
compatible = "nordic,mram";
824-
reg = <0 DT_SIZE_K(3972)>;
825-
erase-block-size = <4096>;
826-
write-block-size = <4>;
827-
};
828-
829-
cpuflpr_mram: mram@3e1000 {
830-
compatible = "nordic,mram";
831-
reg = <0x3e1000 DT_SIZE_K(116)>;
832-
erase-block-size = <4096>;
833-
write-block-size = <4>;
834-
};
835-
};
836-
837815
cpuapp_ppb: cpuapp-ppb-bus {
838816
#address-cells = <1>;
839817
#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@0x4e000 {
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)