From ed4e158674ae575876742128201e9d2805341583 Mon Sep 17 00:00:00 2001 From: Nikodem Kastelik Date: Fri, 22 Aug 2025 14:05:57 +0200 Subject: [PATCH 1/3] [nrf fromtree] manifest: update hal_nordic revision to integrate nrfx 3.14.0 New nrfx release contains MDK 8.72.2 and various fixes for nRF devices. Signed-off-by: Nikodem Kastelik (cherry picked from commit c1d28a4ea70df8dae41fc9160b27c34174ab9f1f) --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index b8e6b93699e..17e5d7cf22d 100644 --- a/west.yml +++ b/west.yml @@ -200,7 +200,7 @@ manifest: groups: - hal - name: hal_nordic - revision: a6579483deb33112cc763d05a4a3f8085883c1ac + revision: 54f33f10a0b826174fb145f155afa61ce5a44b93 path: modules/hal/nordic groups: - hal From b94b974661c6a86b7328df8f2b641a2ad1ecf5f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Stasiak?= Date: Wed, 30 Jul 2025 08:10:15 +0200 Subject: [PATCH 2/3] [nrf fromtree] soc: nordic: nrf54l: remove redundant inclusion of GLITCHDET MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GLITCHDET is not used in this file and causes issues for devices without GLITCHDET. Signed-off-by: Michał Stasiak (cherry picked from commit a9eadb411d29edbf05fe53c15072a6d0296136e6) --- soc/nordic/nrf54l/soc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c index 85043985e51..76225d70ab7 100644 --- a/soc/nordic/nrf54l/soc.c +++ b/soc/nordic/nrf54l/soc.c @@ -29,7 +29,6 @@ LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL); !defined(__ZEPHYR__) #include -#include #include #include #include From 24a9052682a8086ddd60d557c31d4f5c86f3bb6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Stasiak?= Date: Wed, 13 Aug 2025 12:05:48 +0200 Subject: [PATCH 3/3] [nrf fromtree] drivers: adc: adc_nrfx_saadc: add nRF54LS05B analog pins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added array of analong pins for nRF54LS05B. Signed-off-by: Michał Stasiak (cherry picked from commit 2939ccdf42b9f1467b6c4dbf6149f1ff04795f58) --- drivers/adc/adc_nrfx_saadc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c index 61497326174..06035e2c3c5 100644 --- a/drivers/adc/adc_nrfx_saadc.c +++ b/drivers/adc/adc_nrfx_saadc.c @@ -76,6 +76,13 @@ static const uint32_t saadc_psels[NRF_SAADC_AIN7 + 1] = { [NRF_SAADC_AIN6] = NRF_PIN_PORT_TO_PIN_NUMBER(11U, 1), [NRF_SAADC_AIN7] = NRF_PIN_PORT_TO_PIN_NUMBER(12U, 1), }; +#elif defined(NRF54LS05B_ENGA_XXAA) +static const uint32_t saadc_psels[NRF_SAADC_AIN3 + 1] = { + [NRF_SAADC_AIN0] = NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1), + [NRF_SAADC_AIN1] = NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1), + [NRF_SAADC_AIN2] = NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1), + [NRF_SAADC_AIN3] = NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1), +}; #endif #else