Skip to content

dts/boards: nordic: Fix some reg issues #93098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+45 −59
Open

dts/boards: nordic: Fix some reg issues #93098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20c0eda
dts: vendor: nordic: Add missing reg parameters
nordicjm Jul 14, 2025
8a54cd9
boards: nordic: Remove invalid mxicy compatible
nordicjm Jul 14, 2025
d4e6dbc
boards: nordic: nrf54l15dk: Fix cpuflpr SRAM address
nordicjm Jul 14, 2025
bc65034
dts: arm: nordic: Remove superfluous compatible strings
nordicjm Jul 14, 2025
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
2 changes: 1 addition & 1 deletion boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ ipc0: &cpuapp_cpurad_ipc {
status = "okay";

mx25uw63: mx25uw6345g@0 {
compatible = "mxicy,mx25u", "jedec,mspi-nor";
compatible = "jedec,mspi-nor";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The compatible needs to stay, quirks in mspi_nor driver depend on it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

then a compatible binding needs to be created

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and actually that isn't even right, it should be doing what the spi_nor driver does with flags: https://github.com/zephyrproject-rtos/zephyr/blob/main/dts/bindings/mtd/jedec%2Cspi-nor-common.yaml#L93

status = "disabled";
reg = <0>;
jedec-id = [c2 84 37];
Expand Down
17 changes: 11 additions & 6 deletions boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuflpr.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
#include <nordic/nrf54l15_cpuflpr.dtsi>
#include "nrf54l15dk_common.dtsi"

/delete-node/ &cpuflpr_sram;

/ {
model = "Nordic nRF54L15 DK nRF54L15 FLPR MCU";
compatible = "nordic,nrf54l15dk_nrf54l15-cpuflpr";
Expand All @@ -19,13 +21,16 @@
zephyr,flash = &cpuflpr_rram;
zephyr,sram = &cpuflpr_sram;
};
};

&cpuflpr_sram {
status = "okay";
/* size must be increased due to booting from SRAM */
reg = <0x20028000 DT_SIZE_K(96)>;
ranges = <0x0 0x20028000 0x18000>;
cpuflpr_sram: memory@20028000 {
compatible = "mmio-sram";
/* Size must be increased due to booting from SRAM */
reg = <0x20028000 DT_SIZE_K(96)>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x20028000 0x18000>;
status = "okay";
};
};

&cpuflpr_rram {
Expand Down
2 changes: 1 addition & 1 deletion boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ ipc0: &cpuapp_cpurad_ipc {
status = "okay";

mx25uw63: mx25uw6345g@0 {
compatible = "mxicy,mx25u", "jedec,mspi-nor";
compatible = "jedec,mspi-nor";
status = "disabled";
reg = <0>;
jedec-id = [c2 84 37];
Expand Down
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf51822_qfaa.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf51822-qfaa", "nordic,nrf51822",
"nordic,nrf51", "simple-bus";
compatible = "simple-bus";
};
};
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf51822_qfab.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf51822-qfab", "nordic,nrf51822",
"nordic,nrf51", "simple-bus";
compatible = "simple-bus";
};
};
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf51822_qfac.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf51822-qfac", "nordic,nrf51822",
"nordic,nrf51", "simple-bus";
compatible = "simple-bus";
};
};
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf52805_caaa.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf52805-caaa", "nordic,nrf52805",
"nordic,nrf52", "simple-bus";
compatible = "simple-bus";
};
};
1 change: 1 addition & 0 deletions dts/arm/nordic/nrf52810.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@
#io-channel-cells = <1>;
zephyr,pm-device-runtime-auto;
};

timer0: timer@40008000 {
compatible = "nordic,nrf-timer";
status = "disabled";
Expand Down
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf52810_qfaa.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf52810-qfaa", "nordic,nrf52810",
"nordic,nrf52", "simple-bus";
compatible = "simple-bus";
};
};
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf52811_qfaa.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf52811-qfaa", "nordic,nrf52811",
"nordic,nrf52", "simple-bus";
compatible = "simple-bus";
};
};
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf52820_qdaa.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf52820-qdaa", "nordic,nrf52820",
"nordic,nrf52", "simple-bus";
compatible = "simple-bus";
};
};
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf52832_ciaa.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf52832-ciaa", "nordic,nrf52832",
"nordic,nrf52", "simple-bus";
compatible = "simple-bus";
};
};
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf52832_qfaa.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf52832-qfaa", "nordic,nrf52832",
"nordic,nrf52", "simple-bus";
compatible = "simple-bus";
};
};
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf52832_qfab.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf52832-qfab", "nordic,nrf52832",
"nordic,nrf52", "simple-bus";
compatible = "simple-bus";
};
};
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf52833_qdaa.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf52833-qdaa", "nordic,nrf52833",
"nordic,nrf52", "simple-bus";
compatible = "simple-bus";
};
};
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf52833_qiaa.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf52833-qiaa", "nordic,nrf52833",
"nordic,nrf52", "simple-bus";
compatible = "simple-bus";
};
};
4 changes: 1 addition & 3 deletions dts/arm/nordic/nrf52840_qfaa.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@

/ {
soc {
compatible = "nordic,nrf52840-qfaa", "nordic,nrf52840",
"nordic,nrf52", "simple-bus";
compatible = "simple-bus";
};

};

/delete-node/ &usbd;
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf52840_qiaa.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

/ {
soc {
compatible = "nordic,nrf52840-qiaa", "nordic,nrf52840",
"nordic,nrf52", "simple-bus";
compatible = "simple-bus";
};
};
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf5340_cpuapp_qkaa.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf5340-cpuapp-qkaa", "nordic,nrf5340-cpuapp",
"nordic,nrf53", "simple-bus";
compatible = "simple-bus";
};
};
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf5340_cpuappns_qkaa.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf5340-cpuapp-qkaa", "nordic,nrf5340-cpuapp",
"nordic,nrf53", "simple-bus";
compatible = "simple-bus";
};
};
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf5340_cpunet_qkaa.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

/ {
soc {
compatible = "nordic,nrf5340-cpunet-qkaa", "nordic,nrf5340-cpunet",
"nordic,nrf53", "simple-bus";
compatible = "simple-bus";
};
};
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf9131_laca.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf9131-laca", "nordic,nrf9120",
"nordic,nrf91", "simple-bus";
compatible = "simple-bus";
};
};
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf9131ns_laca.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf9131-laca", "nordic,nrf9120",
"nordic,nrf91", "simple-bus";
compatible = "simple-bus";
};
};
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf9151_laca.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf9151-laca", "nordic,nrf9120",
"nordic,nrf91", "simple-bus";
compatible = "simple-bus";
};
};
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf9151ns_laca.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf9151-laca", "nordic,nrf9120",
"nordic,nrf91", "simple-bus";
compatible = "simple-bus";
};
};
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf9160_sica.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf9160-sica", "nordic,nrf9160",
"nordic,nrf91", "simple-bus";
compatible = "simple-bus";
};
};
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf9160ns_sica.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf9160-sica", "nordic,nrf9160",
"nordic,nrf91", "simple-bus";
compatible = "simple-bus";
};
};
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf9161_laca.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf9161-laca", "nordic,nrf9120",
"nordic,nrf91", "simple-bus";
compatible = "simple-bus";
};
};
3 changes: 1 addition & 2 deletions dts/arm/nordic/nrf9161ns_laca.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

/ {
soc {
compatible = "nordic,nrf9161-laca", "nordic,nrf9120",
"nordic,nrf91", "simple-bus";
compatible = "simple-bus";
};
};
2 changes: 2 additions & 0 deletions dts/vendor/nordic/nrf54l09.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,13 @@

#ifdef USE_NON_SECURE_ADDRESS_MAP
global_peripherals: peripheral@40000000 {
reg = <0x40000000 0x10000000>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x40000000 0x10000000>;
#else
global_peripherals: peripheral@50000000 {
reg = <0x50000000 0x10000000>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x50000000 0x10000000>;
Expand Down
1 change: 1 addition & 0 deletions dts/vendor/nordic/nrf54l20.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
};

global_peripherals: peripheral@50000000 {
reg = <0x50000000 0x10000000>;
ranges = <0x0 0x50000000 0x10000000>;
#address-cells = <1>;
#size-cells = <1>;
Expand Down
2 changes: 2 additions & 0 deletions dts/vendor/nordic/nrf54l_05_10_15.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,13 @@

#ifdef USE_NON_SECURE_ADDRESS_MAP
global_peripherals: peripheral@40000000 {
reg = <0x40000000 0x10000000>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x40000000 0x10000000>;
#else
global_peripherals: peripheral@50000000 {
reg = <0x50000000 0x10000000>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x50000000 0x10000000>;
Expand Down
1 change: 1 addition & 0 deletions dts/vendor/nordic/nrf54lm20a.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
};

global_peripherals: peripheral@50000000 {
reg = <0x50000000 0x10000000>;
ranges = <0x0 0x50000000 0x10000000>;
#address-cells = <1>;
#size-cells = <1>;
Expand Down