Skip to content

Commit b3f2de6

Browse files
57300gmarull
authored andcommitted
dts: bindings: Update nordic,nrf-mpc
Update the MPC binding to cover both nRF54H20 and nRF7120 use cases. Note that the MPC IP revisions used by the two devices are compatible. Property `protection-region-size` is renamed to `override-granularity`, a more appropriate term which comes from the datasheet. The description is also corrected, as MPC stands for Memory Privilege Controller. Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
1 parent 0a5fa17 commit b3f2de6

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

dts/bindings/mpc/nordic,nrf-mpc.yaml

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
1-
description: Nordic, Memory Protection Controller (MPC)
1+
description: Nordic Memory Privilege Controller (MPC)
22

33
compatible: "nordic,nrf-mpc"
44

55
include: base.yaml
66

77
properties:
8-
protection-region-size:
8+
reg:
9+
required: true
10+
11+
override-num:
12+
type: int
13+
description: Number of override regions supported by the MPC instance.
14+
15+
override-granularity:
916
type: int
10-
description: Region size for the Memory Protection Controller (MPC) in bytes.
17+
description: Override region addresses must be aligned to this value.

dts/common/nordic/nrf7120_enga.dtsi

+2-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@
8282
#size-cells = <1>;
8383
compatible = "nordic,nrf-mpc";
8484
reg = <0x50041000 0x1000>;
85-
protection-region-size = <4096>;
85+
override-num = <14>;
86+
override-granularity = <4096>;
8687
};
8788
};
8889

soc/nordic/nrf71/Kconfig

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ DT_MPC_REGION_SIZE := $(dt_nodelabel_path,nrf_mpc_region)
2828

2929
config NRF_TRUSTZONE_FLASH_REGION_SIZE
3030
hex
31-
default $(dt_node_int_prop_hex,$(DT_MPC_REGION_SIZE),protection-region-size)
31+
default $(dt_node_int_prop_hex,$(DT_MPC_REGION_SIZE),override-granularity)
3232
help
3333
This defines the flash region size from the TRUSTZONE perspective.
3434
It is used when configuring the TRUSTZONE and when setting alignments
@@ -38,7 +38,7 @@ config NRF_TRUSTZONE_FLASH_REGION_SIZE
3838

3939
config NRF_TRUSTZONE_RAM_REGION_SIZE
4040
hex
41-
default $(dt_node_int_prop_hex,$(DT_MPC_REGION_SIZE),protection-region-size)
41+
default $(dt_node_int_prop_hex,$(DT_MPC_REGION_SIZE),override-granularity)
4242
help
4343
This defines the RAM region size from the TRUSTZONE perspective.
4444
It is used when configuring the TRUSTZONE and when setting alignments

0 commit comments

Comments
 (0)