From 1579246f32cf8fddf85cb377df700021124c43b2 Mon Sep 17 00:00:00 2001 From: Ioannis Glaropoulos Date: Wed, 10 Jun 2020 19:45:53 +0200 Subject: [PATCH] dts: arm: nordic: move number of MPU regions in variant-specific file Move the definition of the number of MPU regions (num-mpu-regions) in a SoC variant-specific header instead of the common .dtsi for nRF5340 Application MCU. This allows us to define different SoC variants with different number of MPU regions available. Signed-off-by: Ioannis Glaropoulos --- dts/arm/nordic/nrf5340_cpuapp.dtsi | 1 - dts/arm/nordic/nrf5340_cpuapp_qkaa.dtsi | 4 ++++ dts/arm/nordic/nrf5340_cpuappns.dtsi | 1 - dts/arm/nordic/nrf5340_cpuappns_qkaa.dtsi | 4 ++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dts/arm/nordic/nrf5340_cpuapp.dtsi b/dts/arm/nordic/nrf5340_cpuapp.dtsi index f6a2fb95dbb..904124c8c80 100644 --- a/dts/arm/nordic/nrf5340_cpuapp.dtsi +++ b/dts/arm/nordic/nrf5340_cpuapp.dtsi @@ -23,7 +23,6 @@ mpu: mpu@e000ed90 { compatible = "arm,armv8m-mpu"; reg = <0xe000ed90 0x40>; - arm,num-mpu-regions = <16>; }; }; }; diff --git a/dts/arm/nordic/nrf5340_cpuapp_qkaa.dtsi b/dts/arm/nordic/nrf5340_cpuapp_qkaa.dtsi index 8db9eb27253..aeae491ed69 100644 --- a/dts/arm/nordic/nrf5340_cpuapp_qkaa.dtsi +++ b/dts/arm/nordic/nrf5340_cpuapp_qkaa.dtsi @@ -15,6 +15,10 @@ reg = <0x20000000 DT_SIZE_K(512)>; }; +&mpu { + arm,num-mpu-regions = <16>; +}; + / { soc { compatible = "nordic,nRF5340-CPU0-QKAA", "nordic,nRF5340-CPU0", "nordic,nRF53", "simple-bus"; diff --git a/dts/arm/nordic/nrf5340_cpuappns.dtsi b/dts/arm/nordic/nrf5340_cpuappns.dtsi index 6d7c24275e9..f16abc1211e 100644 --- a/dts/arm/nordic/nrf5340_cpuappns.dtsi +++ b/dts/arm/nordic/nrf5340_cpuappns.dtsi @@ -25,7 +25,6 @@ mpu: mpu@e000ed90 { compatible = "arm,armv8m-mpu"; reg = <0xe000ed90 0x40>; - arm,num-mpu-regions = <16>; }; }; }; diff --git a/dts/arm/nordic/nrf5340_cpuappns_qkaa.dtsi b/dts/arm/nordic/nrf5340_cpuappns_qkaa.dtsi index 192ef051267..96f98bf191b 100644 --- a/dts/arm/nordic/nrf5340_cpuappns_qkaa.dtsi +++ b/dts/arm/nordic/nrf5340_cpuappns_qkaa.dtsi @@ -15,6 +15,10 @@ reg = <0x20000000 DT_SIZE_K(512)>; }; +&mpu { + arm,num-mpu-regions = <16>; +}; + / { soc { compatible = "nordic,nRF5340-CPU0-QKAA", "nordic,nRF5340-CPU0", "nordic,nRF53", "simple-bus";