From cc927e640d635e656a542cedfde9e263b730beac Mon Sep 17 00:00:00 2001 From: Nikodem Kastelik Date: Wed, 18 Sep 2024 13:56:06 +0200 Subject: [PATCH] [nrf fromlist] manifest: update hal_nordic for normal voltage mode fix Normal voltage mode fix is part of MDK 8.67.0. Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/78643 Signed-off-by: Nikodem Kastelik --- soc/nordic/nrf54l/Kconfig | 3 +++ soc/nordic/nrf54l/soc.c | 4 ---- west.yml | 7 +++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig index f5e62021e1e..6f29ea5272f 100644 --- a/soc/nordic/nrf54l/Kconfig +++ b/soc/nordic/nrf54l/Kconfig @@ -59,6 +59,9 @@ config SOC_NRF54L_VREG_MAIN_DCDC To enable, an inductor must be connected to the DC/DC converter pin. config SOC_NRF54L_NORMAL_VOLTAGE_MODE + select DEPRECATED + help + This mode is deprecated and shall no longer be used. bool "NRF54L Normal Voltage Mode." if NRF_GRTC_TIMER diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c index 713e4e474d5..7ac26fb79bc 100644 --- a/soc/nordic/nrf54l/soc.c +++ b/soc/nordic/nrf54l/soc.c @@ -153,10 +153,6 @@ static int nordicsemi_nrf54l_init(void) nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MAIN, true); } - if (IS_ENABLED(CONFIG_SOC_NRF54L_NORMAL_VOLTAGE_MODE)) { - nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MEDIUM, false); - } - #if defined(CONFIG_ELV_GRTC_LFXO_ALLOWED) nrf_regulators_elv_mode_allow_set(NRF_REGULATORS, NRF_REGULATORS_ELV_ELVGRTCLFXO_MASK); #endif /* CONFIG_ELV_GRTC_LFXO_ALLOWED */ diff --git a/west.yml b/west.yml index e0c277e4ebe..88d2aef8896 100644 --- a/west.yml +++ b/west.yml @@ -23,6 +23,8 @@ manifest: url-base: https://github.com/zephyrproject-rtos - name: babblesim url-base: https://github.com/BabbleSim + - name: ncs + url-base: https://github.com/nrfconnect group-filter: [-babblesim, -optional] @@ -182,8 +184,9 @@ manifest: path: modules/hal/microchip groups: - hal - - name: hal_nordic - revision: ab5cb2e2faeb1edfad7a25286dcb513929ae55da + - name: sdk-hal_nordic + remote: ncs + revision: 3e3ecc1483f221455dfd7333474ed3d3c5192844 path: modules/hal/nordic groups: - hal