Skip to content

Commit d451327

Browse files
kl-cruzrlubos
authored andcommitted
[nrf fromtree] soc: nordic: Extend address validation to cover GPREGRET
Extension of the validate_base_addresses.c file to cover GPREGRET in all Nordic SoCs. Signed-off-by: Karol Lasończyk <[email protected]> (cherry picked from commit 8f2d3e7)
1 parent 49957e5 commit d451327

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

soc/nordic/validate_base_addresses.c

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,19 @@
7373
#define NRF_WDT0 NRF_WDT
7474
#endif
7575

76+
#if !defined(NRF_POWER_GPREGRET1) && defined(NRF_POWER)
7677
#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_SERIES_NRF52X)
77-
#if !defined(NRF_POWER_GPREGRET1) && defined(NRF_POWER_BASE)
78-
#define NRF_POWER_GPREGRET1 (0x51c + NRF_POWER_BASE)
78+
#define NRF_POWER_GPREGRET1 (&NRF_POWER->GPREGRET)
79+
#else
80+
#define NRF_POWER_GPREGRET1 (&NRF_POWER->GPREGRET[0])
81+
#endif
7982
#endif
8083

81-
#if !defined(NRF_POWER_GPREGRET2) && defined(NRF_POWER_BASE)
82-
#define NRF_POWER_GPREGRET2 (0x520 + NRF_POWER_BASE)
84+
#if !defined(NRF_POWER_GPREGRET2) && defined(NRF_POWER)
85+
#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_SERIES_NRF52X)
86+
#define NRF_POWER_GPREGRET2 (&NRF_POWER->GPREGRET2)
87+
#else
88+
#define NRF_POWER_GPREGRET2 (&NRF_POWER->GPREGRET[1])
8389
#endif
8490
#endif
8591

@@ -367,9 +373,5 @@ CHECK_DT_REG(cpurad_wdt010, NRF_RADIOCORE_WDT010);
367373
CHECK_DT_REG(cpurad_wdt011, NRF_RADIOCORE_WDT011);
368374
CHECK_DT_REG(wdt131, NRF_WDT131);
369375
CHECK_DT_REG(wdt132, NRF_WDT132);
370-
371-
/* nRF51/nRF52-specific addresses */
372-
#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_SERIES_NRF52X)
373376
CHECK_DT_REG(gpregret1, NRF_POWER_GPREGRET1);
374377
CHECK_DT_REG(gpregret2, NRF_POWER_GPREGRET2);
375-
#endif

0 commit comments

Comments
 (0)