Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions boards/nordic/nrf7120dk/nrf7120dk_nrf7120-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@
compatible = "gpio-leds";

led0: led_0 {
gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>;
gpios = <&gpio4 8 GPIO_ACTIVE_HIGH>;
label = "Green LED 0";
};

led1: led_1 {
gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
gpios = <&gpio4 9 GPIO_ACTIVE_HIGH>;
label = "Green LED 1";
};

led2: led_2 {
gpios = <&gpio2 7 GPIO_ACTIVE_HIGH>;
gpios = <&gpio4 10 GPIO_ACTIVE_HIGH>;
label = "Green LED 2";
};

led3: led_3 {
gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
gpios = <&gpio4 11 GPIO_ACTIVE_HIGH>;
label = "Green LED 3";
};
};
Expand All @@ -49,25 +49,25 @@
compatible = "gpio-keys";

button0: button_0 {
gpios = <&gpio1 13 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
gpios = <&gpio1 12 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
label = "Push button 0";
zephyr,code = <INPUT_KEY_0>;
};

button1: button_1 {
gpios = <&gpio1 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
gpios = <&gpio1 13 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
label = "Push button 1";
zephyr,code = <INPUT_KEY_1>;
};

button2: button_2 {
gpios = <&gpio1 8 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
gpios = <&gpio1 14 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
label = "Push button 2";
zephyr,code = <INPUT_KEY_2>;
};

button3: button_3 {
gpios = <&gpio0 4 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
gpios = <&gpio1 15 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
label = "Push button 3";
zephyr,code = <INPUT_KEY_3>;
};
Expand Down
7 changes: 7 additions & 0 deletions boards/nordic/nrf7120dk/nrf7120dk_nrf7120_cpuapp_ns.dts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@
chosen {
zephyr,code-partition = &slot0_ns_partition;
zephyr,sram = &cpuapp_sram;
zephyr,entropy = &psa_rng;
};

/delete-node/ rng;

psa_rng: psa-rng {
status = "okay";
};
};

Expand Down
2 changes: 1 addition & 1 deletion drivers/entropy/Kconfig.nrf_cracen
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ config ENTROPY_NRF_CRACEN_CTR_DRBG
bool "nRF entropy driver based on the CRACEN CTR_DRBG driver"
default y
depends on DT_HAS_NORDIC_NRF_CRACEN_CTRDRBG_ENABLED
depends on SOC_COMPATIBLE_NRF54LX || SOC_COMPATIBLE_NRF7120_ENGA
depends on SOC_COMPATIBLE_NRF54LX || SOC_COMPATIBLE_NRF71
select ENTROPY_HAS_DRIVER
select NRFX_CRACEN
help
Expand Down
2 changes: 1 addition & 1 deletion dts/arm/nordic/nrf7120_enga_cpuapp.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ nvic: &cpuapp_nvic {};

/ {
chosen {
zephyr,entropy = &psa_rng;
zephyr,entropy = &rng;
};

soc {
Expand Down
4 changes: 2 additions & 2 deletions dts/riscv/nordic/nrf7120_enga_cpuflpr.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ clic: &cpuflpr_clic {};
/delete-node/ &cpuapp_mram;

&mram_controller {
cpuflpr_mram: mram@3e0000 {
cpuflpr_mram: mram@3de000 {
compatible = "soc-nv-flash";
reg = <0x3e0000 DT_SIZE_K(116)>;
reg = <0x3de000 DT_SIZE_K(116)>;
erase-block-size = <4096>;
write-block-size = <4>;
};
Expand Down
8 changes: 4 additions & 4 deletions dts/vendor/nordic/nrf7120_cpuapp_partition.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

&cpuapp_mram {
reg = <0x0 DT_SIZE_K(4084)>;
reg = <0x0 DT_SIZE_K(4076)>;
};

/* These partition sizes assume no FLPR area in MRAM */
Expand All @@ -25,17 +25,17 @@

slot0_partition: partition@10000 {
label = "image-0";
reg = <0x00010000 DT_SIZE_K(1992)>;
reg = <0x00010000 DT_SIZE_K(1988)>;
};

slot1_partition: partition@202000 {
label = "image-1";
reg = <0x00202000 DT_SIZE_K(1992)>;
reg = <0x00201000 DT_SIZE_K(1988)>;
};

storage_partition: partition@3f4000 {
label = "storage";
reg = <0x003f4000 DT_SIZE_K(36)>;
reg = <0x003f2000 DT_SIZE_K(36)>;
};
};
};
30 changes: 28 additions & 2 deletions dts/vendor/nordic/nrf7120_enga.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -878,6 +878,32 @@
status = "disabled";
};

power: power@10e000 {
compatible = "nordic,nrf-power";
reg = <0x10e000 0x1000>;
ranges = <0x0 0x10e000 0x1000>;
interrupts = <261 NRF_DEFAULT_IRQ_PRIORITY>;
status = "disabled";
#address-cells = <1>;
#size-cells = <1>;

gpregret1: gpregret1@500 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "nordic,nrf-gpregret";
reg = <0x500 0x1>;
status = "disabled";
};

gpregret2: gpregret2@504 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "nordic,nrf-gpregret";
reg = <0x504 0x1>;
status = "disabled";
};
};

audio_auxpll: auxpll@130000 {
compatible = "nordic,nrf-auxpll";
reg = <0x130000 0x1000>;
Expand Down Expand Up @@ -939,8 +965,8 @@

cpuapp_mram: mram@0 {
compatible = "soc-nv-flash";
reg = <0 DT_SIZE_K(4084)>;
ranges = <0x0 0 DT_SIZE_K(4084)>;
reg = <0 DT_SIZE_K(4076)>;
ranges = <0x0 0 DT_SIZE_K(4076)>;
erase-block-size = <4096>;
write-block-size = <4>;
#address-cells = <1>;
Expand Down
2 changes: 1 addition & 1 deletion modules/hal_nordic/nrfx/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ config NRFX_COMP

config NRFX_CRACEN
bool "CRACEN drivers"
depends on SOC_COMPATIBLE_NRF54LX
depends on SOC_COMPATIBLE_NRF54LX || SOC_COMPATIBLE_NRF71
select NRFX_CRACEN_BSIM_SUPPORT if SOC_SERIES_BSIM_NRFXX

config NRFX_CRACEN_BSIM_SUPPORT
Expand Down
3 changes: 3 additions & 0 deletions snippets/nordic/nordic-flpr/snippet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ boards:
/.*/nrf54lm20a/cpuapp/:
append:
EXTRA_DTC_OVERLAY_FILE: soc/nrf54lm20a_cpuapp.overlay
/.*/nrf7120/cpuapp/:
append:
EXTRA_DTC_OVERLAY_FILE: soc/nrf7120_cpuapp.overlay
37 changes: 37 additions & 0 deletions snippets/nordic/nordic-flpr/soc/nrf7120_cpuapp.overlay
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
* Copyright (c) 2026 Nordic Semiconductor
* SPDX-License-Identifier: Apache-2.0
*/

&ram03_sram {
cpuflpr_sram_code_data: sram@0 {
compatible = "mmio-sram";
reg = <0x0 DT_SIZE_K(116)>;
status = "reserved";
};
};

&mram_controller {
cpuflpr_mram: mram@3de000 {
compatible = "soc-nv-flash";
reg = <0x3de000 DT_SIZE_K(116)>;
ranges = <0x0 0x3de000 DT_SIZE_K(116)>;
erase-block-size = <4096>;
write-block-size = <4>;
#address-cells = <1>;
#size-cells = <1>;
};
};

&uart00 {
status = "reserved";
};

&cpuflpr_vpr {
execution-memory = <&cpuflpr_sram_code_data>;
source-memory = <&cpuflpr_mram>;
};

&cpuapp_vevif_tx {
status = "okay";
};
3 changes: 3 additions & 0 deletions soc/nordic/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ config SOC_COMPATIBLE_NRF54LM20A
config SOC_COMPATIBLE_NRF54LM20A_CPUAPP
bool

config SOC_COMPATIBLE_NRF71
bool

config SOC_COMPATIBLE_NRF7120_ENGA
bool

Expand Down
1 change: 1 addition & 0 deletions soc/nordic/nrf71/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# SPDX-License-Identifier: Apache-2.0

config SOC_SERIES_NRF71
select SOC_COMPATIBLE_NRF71
select HAS_NRFX
select HAS_NORDIC_DRIVERS
select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
Expand Down
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ manifest:
groups:
- hal
- name: hal_nordic
revision: 63f2083ff9bc9c39b39f0a874becc7cf8e011a2a
revision: 0ab6844ed2d26f908e3975cfefa260d0bed16c3f
path: modules/hal/nordic
groups:
- hal
Expand Down