From db8023d884579f7fe87c065baa3ebffc35f66d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= Date: Fri, 29 Nov 2024 10:16:46 +0100 Subject: [PATCH 1/3] [nrf fromtree] drivers: serial: nrfx_uarte: Fix endtx-stoptx property check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The UART_xyz_ENHANCED_POLL_OUT Kconfig was using an outdated property for checking whether the peripheral has the endtx->stoptx short. The property is now updated. Signed-off-by: Rafał Kuźnia (cherry picked from commit ec1f662dc96a72b6e4b8b3443915c202ff2240d8) Signed-off-by: Rafał Kuźnia --- drivers/serial/Kconfig.nrfx_uart_instance | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/serial/Kconfig.nrfx_uart_instance b/drivers/serial/Kconfig.nrfx_uart_instance index 8bc3f6c5e2c..f75ee78c62b 100644 --- a/drivers/serial/Kconfig.nrfx_uart_instance +++ b/drivers/serial/Kconfig.nrfx_uart_instance @@ -20,7 +20,7 @@ config UART_$(nrfx_uart_num)_ASYNC config UART_$(nrfx_uart_num)_ENHANCED_POLL_OUT bool "Efficient poll out on port $(nrfx_uart_num)" - depends on !$(dt_nodelabel_has_prop,uart$(nrfx_uart_num),short-endtx-stoptx) + depends on !$(dt_nodelabel_has_prop,uart$(nrfx_uart_num),endtx-stoptx-supported) default y depends on HAS_HW_NRF_UARTE$(nrfx_uart_num) depends on HAS_HW_NRF_PPI || HAS_HW_NRF_DPPIC From fe8b1b826e416d771ec73e609e79af319e86a414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= Date: Thu, 28 Nov 2024 14:29:23 +0100 Subject: [PATCH 2/3] [nrf fromtree] soc: nordic: enable DPPI and PPIB nodes by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The DPPI and PPIB peripheral nodes must be enabled to allow the CONFIG_HAS_HW_NRF_DPPIC to be set. This change is consistent with what was done on nRF5340 and does not introduce any additional memory overhead, because there is no Zephyr driver behind the nrf-dppic and nrf-ppib bindings. Signed-off-by: Rafał Kuźnia (cherry picked from commit d890cfd8180ee033deead6bb208c12e5a777d85a) Signed-off-by: Rafał Kuźnia --- dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi | 48 ++++++++++++++++++++++ dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi | 48 ++++++++++++++++++++++ 2 files changed, 96 insertions(+) diff --git a/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi b/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi index d8fffc93808..1444be3b57b 100644 --- a/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi +++ b/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi @@ -49,3 +49,51 @@ nvic: &cpuapp_nvic {}; &gpiote30 { interrupts = <269 NRF_DEFAULT_IRQ_PRIORITY>; }; + +&dppic00 { + status = "okay"; +}; + +&dppic10 { + status = "okay"; +}; + +&dppic20 { + status = "okay"; +}; + +&dppic30 { + status = "okay"; +}; + +&ppib00 { + status = "okay"; +}; + +&ppib01 { + status = "okay"; +}; + +&ppib10 { + status = "okay"; +}; + +&ppib11 { + status = "okay"; +}; + +&ppib20 { + status = "okay"; +}; + +&ppib21 { + status = "okay"; +}; + +&ppib22 { + status = "okay"; +}; + +&ppib30 { + status = "okay"; +}; diff --git a/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi b/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi index 2de29fcdbd2..d90dd3dd7d6 100644 --- a/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi +++ b/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi @@ -85,3 +85,51 @@ nvic: &cpuapp_nvic {}; interrupts = <269 NRF_DEFAULT_IRQ_PRIORITY>; #endif }; + +&dppic00 { + status = "okay"; +}; + +&dppic10 { + status = "okay"; +}; + +&dppic20 { + status = "okay"; +}; + +&dppic30 { + status = "okay"; +}; + +&ppib00 { + status = "okay"; +}; + +&ppib01 { + status = "okay"; +}; + +&ppib10 { + status = "okay"; +}; + +&ppib11 { + status = "okay"; +}; + +&ppib20 { + status = "okay"; +}; + +&ppib21 { + status = "okay"; +}; + +&ppib22 { + status = "okay"; +}; + +&ppib30 { + status = "okay"; +}; From b17edb692f981f8df70d3c3115bfe5b72c4f1ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= Date: Wed, 11 Dec 2024 10:07:50 +0100 Subject: [PATCH 3/3] [nrf fromlist] manifest: update hal_nordic revision MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The nrfx sample applications now enable nrfx_gppi functionality explicitly. Upstream PR #: 82842 Signed-off-by: Rafał Kuźnia --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 6061b2c5a05..49c2e9e47ce 100644 --- a/west.yml +++ b/west.yml @@ -188,7 +188,7 @@ manifest: groups: - hal - name: hal_nordic - revision: fae15426c6b5a1f67362d508cf51b691ae5ab4b4 + revision: dbfe4a14cf0ac7425ef58f1a01576873f5976f4c path: modules/hal/nordic groups: - hal