diff --git a/snippets/nrf91-modem-trace-uart/snippet.yml b/snippets/nrf91-modem-trace-uart/snippet.yml index feb7ff72069f..d537c259712b 100644 --- a/snippets/nrf91-modem-trace-uart/snippet.yml +++ b/snippets/nrf91-modem-trace-uart/snippet.yml @@ -1,4 +1,11 @@ name: nrf91-modem-trace-uart append: - EXTRA_DTC_OVERLAY_FILE: modem-trace-uart.overlay - EXTRA_CONF_FILE: overlay-modem-trace-uart.conf + EXTRA_CONF_FILE: ../nrf9x-modem-trace-uart/modem-trace-uart-common.conf + +boards: + /.*/nrf91[0-9][0-9]/.*/: + append: + EXTRA_DTC_OVERLAY_FILE: ../nrf9x-modem-trace-uart/modem-trace-uart-nrf91.overlay + EXTRA_CONF_FILE: ../nrf9x-modem-trace-uart/modem-trace-uart-nrf91.conf + +#Deprecated. Kept for backwards compatibility. Use snippet nrf9x-modem-trace-uart. diff --git a/snippets/nrf91-modem-trace-uart/overlay-modem-trace-uart.conf b/snippets/nrf9x-modem-trace-uart/modem-trace-uart-common.conf similarity index 56% rename from snippets/nrf91-modem-trace-uart/overlay-modem-trace-uart.conf rename to snippets/nrf9x-modem-trace-uart/modem-trace-uart-common.conf index 08665ca2d3a1..95e938d9a515 100644 --- a/snippets/nrf91-modem-trace-uart/overlay-modem-trace-uart.conf +++ b/snippets/nrf9x-modem-trace-uart/modem-trace-uart-common.conf @@ -1,5 +1,5 @@ # -# Copyright (c) 2023 Nordic Semiconductor +# Copyright (c) 2025 Nordic Semiconductor # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # @@ -9,11 +9,6 @@ CONFIG_NRF_MODEM_LIB_TRACE=y # Modem trace uart backend CONFIG_NRF_MODEM_LIB_TRACE_BACKEND_UART=y -# UART configuration +# UART configuration (common) CONFIG_SERIAL=y CONFIG_UART_ASYNC_API=y -CONFIG_UART_1_ASYNC=y -CONFIG_UART_1_INTERRUPT_DRIVEN=n - -# Power management -CONFIG_PM_DEVICE=y diff --git a/snippets/nrf9x-modem-trace-uart/modem-trace-uart-nrf91.conf b/snippets/nrf9x-modem-trace-uart/modem-trace-uart-nrf91.conf new file mode 100644 index 000000000000..508342b7a287 --- /dev/null +++ b/snippets/nrf9x-modem-trace-uart/modem-trace-uart-nrf91.conf @@ -0,0 +1,12 @@ +# +# Copyright (c) 2023 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# UART configuration (nRF91 specific) +CONFIG_UART_1_ASYNC=y +CONFIG_UART_1_INTERRUPT_DRIVEN=n + +# Power management +CONFIG_PM_DEVICE=y diff --git a/snippets/nrf91-modem-trace-uart/modem-trace-uart.overlay b/snippets/nrf9x-modem-trace-uart/modem-trace-uart-nrf91.overlay similarity index 100% rename from snippets/nrf91-modem-trace-uart/modem-trace-uart.overlay rename to snippets/nrf9x-modem-trace-uart/modem-trace-uart-nrf91.overlay diff --git a/snippets/nrf9x-modem-trace-uart/modem-trace-uart-nrf92.conf b/snippets/nrf9x-modem-trace-uart/modem-trace-uart-nrf92.conf new file mode 100644 index 000000000000..b1c605f8feb6 --- /dev/null +++ b/snippets/nrf9x-modem-trace-uart/modem-trace-uart-nrf92.conf @@ -0,0 +1,9 @@ +# +# Copyright (c) 2025 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# UART configuration (nRF92 specific) +CONFIG_UART_135_ASYNC=y +CONFIG_UART_135_INTERRUPT_DRIVEN=n diff --git a/snippets/nrf9x-modem-trace-uart/modem-trace-uart-nrf92.overlay b/snippets/nrf9x-modem-trace-uart/modem-trace-uart-nrf92.overlay new file mode 100644 index 000000000000..fafebcd321e5 --- /dev/null +++ b/snippets/nrf9x-modem-trace-uart/modem-trace-uart-nrf92.overlay @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2025 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/* Enable uart135 for tracing. */ +&uart135 { + status = "okay"; + current-speed = < 1000000 >; + memory-regions = < &modem_trace_dma_region >; +}; + +/ { + chosen { + nordic,modem-trace-uart = &uart135; + }; + + reserved-memory { + /* Add memory region for tracing UART. */ + modem_trace_dma_region: memory@2fc06800 { + compatible = "nordic,owned-memory", "zephyr,memory-region"; + reg = <0x2fc06800 DT_SIZE_K(2)>; + status = "okay"; + #memory-region-cells = <0>; + nordic,access = ; + zephyr,memory-region = "DMA_RAM3x_MODEM_TRACE"; + zephyr,memory-attr = <( DT_MEM_DMA )>; + }; + }; +}; + +/* Reduce size to make room for modem trace dma region. */ +&cpuapp_dma_region { + reg = <0x2fc06000 DT_SIZE_K(2)>; +}; + +/* Enable the trace signal on the application bellboard. */ +&cpuapp_bellboard { + nordic,interrupt-mapping = <0xE3042041 0>; +}; diff --git a/snippets/nrf9x-modem-trace-uart/snippet.yml b/snippets/nrf9x-modem-trace-uart/snippet.yml new file mode 100644 index 000000000000..c8f6766abd82 --- /dev/null +++ b/snippets/nrf9x-modem-trace-uart/snippet.yml @@ -0,0 +1,13 @@ +name: nrf9x-modem-trace-uart +append: + EXTRA_CONF_FILE: modem-trace-uart-common.conf + +boards: + /.*/nrf91[0-9][0-9]/ns/: + append: + EXTRA_DTC_OVERLAY_FILE: modem-trace-uart-nrf91.overlay + EXTRA_CONF_FILE: modem-trace-uart-nrf91.conf + /.*/nrf92[0-9][0-9]/cpuapp/: + append: + EXTRA_DTC_OVERLAY_FILE: modem-trace-uart-nrf92.overlay + EXTRA_CONF_FILE: modem-trace-uart-nrf92.conf