Skip to content
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

Jump to bottom

[nrf fromlist] soc: nordic: nrf54l: remove configuration of DCDC regulator #2317

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+10 −5
Open

[nrf fromlist] soc: nordic: nrf54l: remove configuration of DCDC regulator #2317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5915505
[nrf fromlist] soc: nordic: nrf54l: remove configuration of DCDC regu…
nika-nordic Nov 28, 2024
0d8d7b8
[nrf fromlist] soc: nordic: nrf54l: add preliminary workaround for nR…
nika-nordic Dec 2, 2024
bf85045
[nrf fromlist] modules: nordic: nrfx: workaround MDK erratas symbol f…
nika-nordic Dec 2, 2024
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
6 changes: 4 additions & 2 deletions modules/hal_nordic/nrfx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,12 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUPPR NRF54H20_XXAA
NRF_PPR)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR NRF54H20_XXAA
NRF_FLPR)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05 NRF54L05_XXAA)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05 NRF54L05_XXAA
DEVELOP_IN_NRF54L15)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUAPP NRF_APPLICATION)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR NRF_FLPR)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10 NRF54L10_XXAA)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10 NRF54L10_XXAA
DEVELOP_IN_NRF54L15)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10_CPUAPP NRF_APPLICATION)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10_CPUFLPR NRF_FLPR)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15 NRF54L15_XXAA)
Expand Down
9 changes: 6 additions & 3 deletions soc/nordic/nrf54l/soc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#endif
#include <soc/nrfx_coredep.h>

#include <nrf_erratas.h>
#include <system_nrf54l.h>

LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
Expand Down Expand Up @@ -154,10 +155,12 @@
}

#if (DT_PROP(DT_NODELABEL(vregmain), regulator_initial_mode) == NRF5X_REG_MODE_DCDC)
#if defined(__CORTEX_M) && !defined(NRF_TRUSTZONE_NONSECURE) && defined(__ARM_FEATURE_CMSE)
if (*(uint32_t volatile *)0x00FFC334 <= 0x180A1D00) {
*(uint32_t volatile *)0x50120640 = 0x1EA9E040;
#if NRF54L_ERRATA_31_ENABLE_WORKAROUND
/* Workaround for Errata 31 */
if (nrf54l_errata_31()) {
*((volatile uint32_t *)0x50120624ul) = 20 | 1<<5;
*((volatile uint32_t *)0x5012063Cul) &= ~(1<<19);
}

Check notice on line 163 in soc/nordic/nrf54l/soc.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

soc/nordic/nrf54l/soc.c:163 
-		*((volatile uint32_t *)0x50120624ul) = 20 | 1<<5;
-		*((volatile uint32_t *)0x5012063Cul) &= ~(1<<19);
+		*((volatile uint32_t *)0x50120624ul) = 20 | 1 << 5;
+		*((volatile uint32_t *)0x5012063Cul) &= ~(1 << 19);
#endif
nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MAIN, true);
#endif
Expand Down
Loading