Skip to content

[Backport ncs-v3.1-branch] [nrf fromlist] dts: nordic: Fix GPREGRET addresses for nRF54LM20A #3138

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

Closed
wants to merge 2 commits into from
Closed

[Backport ncs-v3.1-branch] [nrf fromlist] dts: nordic: Fix GPREGRET addresses for nRF54LM20A #3138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69b6c7e
[nrf fromtree] soc: nordic: Extend address validation to cover GPREGRET
kl-cruz Jul 29, 2025
8f5f5ed
[nrf fromtree] dts: nordic: Fix GPREGRET addresses for nRF54LM20A
kl-cruz Jul 29, 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
8 changes: 4 additions & 4 deletions dts/vendor/nordic/nrf54lm20a.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,19 +800,19 @@
#address-cells = <1>;
#size-cells = <1>;

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

gpregret2: gpregret2@520 {
gpregret2: gpregret2@504 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "nordic,nrf-gpregret";
reg = <0x520 0x1>;
reg = <0x504 0x1>;
status = "disabled";
};
};
Expand Down
18 changes: 10 additions & 8 deletions soc/nordic/validate_base_addresses.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,19 @@
#define NRF_WDT0 NRF_WDT
#endif

#if !defined(NRF_POWER_GPREGRET1) && defined(NRF_POWER)
#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_SERIES_NRF52X)
#if !defined(NRF_POWER_GPREGRET1) && defined(NRF_POWER_BASE)
#define NRF_POWER_GPREGRET1 (0x51c + NRF_POWER_BASE)
#define NRF_POWER_GPREGRET1 (&NRF_POWER->GPREGRET)
#else
#define NRF_POWER_GPREGRET1 (&NRF_POWER->GPREGRET[0])
#endif
#endif

#if !defined(NRF_POWER_GPREGRET2) && defined(NRF_POWER_BASE)
#define NRF_POWER_GPREGRET2 (0x520 + NRF_POWER_BASE)
#if !defined(NRF_POWER_GPREGRET2) && defined(NRF_POWER)
#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_SERIES_NRF52X)
#define NRF_POWER_GPREGRET2 (&NRF_POWER->GPREGRET2)
#else
#define NRF_POWER_GPREGRET2 (&NRF_POWER->GPREGRET[1])
#endif
#endif

Expand Down Expand Up @@ -367,9 +373,5 @@ CHECK_DT_REG(cpurad_wdt010, NRF_RADIOCORE_WDT010);
CHECK_DT_REG(cpurad_wdt011, NRF_RADIOCORE_WDT011);
CHECK_DT_REG(wdt131, NRF_WDT131);
CHECK_DT_REG(wdt132, NRF_WDT132);

/* nRF51/nRF52-specific addresses */
#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_SERIES_NRF52X)
CHECK_DT_REG(gpregret1, NRF_POWER_GPREGRET1);
CHECK_DT_REG(gpregret2, NRF_POWER_GPREGRET2);
#endif
Loading