Upmerge 2024.12.20 #2411
Open
Upmerge 2024.12.20 #2411
+304,237
−85,020
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
NordicBuilder
added
manifest
manifest-hal_wch
manifest-sof
manifest-hal_stm32
manifest-zcbor
manifest-hal_infineon
manifest-hal_intel
manifest-hal_adi
manifest-mcuboot
manifest-hal_xtensa
manifest-nanopb
manifest-hal_wurthelektronik
manifest-nrf_hw_models
manifest-open-amp
manifest-nrf_wifi
manifest-picolibc
manifest-liblc3
manifest-libmetal
manifest-percepio
manifest-trusted-firmware-m
manifest-hal_renesas
manifest-hal_espressif
manifest-hal_rpi_pico
manifest-hal_tdk
manifest-hal_ambiq
manifest-hal_silabs
manifest-cmsis_6
labels
fixup! [nrf noup] tree-wide: support NCS Partition Manager (PM) definitions To read the secure memory we need to use soc_secure_mem_read function instead of memcpy. This commit allows to use the soc_secure_mem_read function if the CONFIG_TRUSTED_EXECUTION_NONSECURE and PARTITION_MANAGER is enabled. Signed-off-by: Arkadiusz Balys <[email protected]> (cherry picked from commit 711346a)
Added clock control api for global hsfll used in fast PWM120 driver. Upstream PR #: 82133 Signed-off-by: Michał Stasiak <[email protected]> (cherry picked from commit 99faf47)
Add clock source for timer120 and timer121 nodes Upstream PR #: 82103 Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit 2430fb2)
…FSLL Add requesting for global HFSLL when fast instance TIMER (e.g. TIMER120 in nrf54h20) is used. Upstream PR #: 82103 Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit 3303b03)
Add support for GRTC clock output pins. Upstream PR #: 82788 Signed-off-by: Adam Kondraciuk <[email protected]>
Add support for GRTC clock output pins. Upstream PR #: 82788 Signed-off-by: Adam Kondraciuk <[email protected]> (cherry picked from commit a7b06ba)
Add support for GRTC clock output pins. Upstream PR #: 82788 Signed-off-by: Adam Kondraciuk <[email protected]> (cherry picked from commit af6174f)
Fix failing tests for nRF54H20 targets. Upstream PR #: 82252 Signed-off-by: Adam Kondraciuk <[email protected]> (cherry picked from commit 878e723)
…ing function This change ensures that LR will not be implicitly used when calling `pm_s2ram_mark_check_and_clear`. Upstream PR #: 81853 Signed-off-by: Adam Kondraciuk <[email protected]> (cherry picked from commit 269aa0f)
Adding support for reset reasons in the nRF54H20 SoC. Upstream PR #: 81751 Signed-off-by: Karol Lasończyk <[email protected]> (cherry picked from commit 622410f)
…ast instance Request fast global domain to run at 320 MHz during fast UARTE activity. As request is asynchronous it cannot be called from an ISR. Due to complexity to handle that without device runtime power management a requirement is added so that if fast UARTE is used device runtime PM must be enabled. Clock is request and released in PM resume and suspended actions which in case of fast UARTE are only called from thread context. Upstream PR #: 82103 Signed-off-by: Krzysztof Chruściński <[email protected]>
…vice PM Enable device runtime PM for nrf54h20dk/nrf54h20/cpuapp where fast UARTE (uart120) is tested. Upstream PR #: 82103 Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit 69ab484)
…ing clock frequency Add NRF_PERIPH_GET_FREQUENCY() that returns the frequency of clock that is used for the node. Upstream PR #: 82133 Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit 36a1e64)
Add a custom section in the linker which should always be placed in the top of RAM. This will be used by the KMU to push keys into it. Since when you provision a key into the KMU you need to set specific a memory location for the PUSH operation we need to keep this memory location static across images/dfus. This is a noup since the KMU is not supported upstream. Ref: NCSDK-25121 Signed-off-by: Georgios Vasilakis <[email protected]> (cherry picked from commit fcecc13)
In this patch we do several things to be able to configure power and clocks when NRF_OSCILLATORS and NRF_REGULATORS is secure. We port soc.c to TF-M so that the TF-M image can do the same configuration that would normally be done by the Zephyr image. This is done by explicitly including autoconf.h for instance. We also ifdef-out the configuration when nordicsemi_nrf54l_init is invoked from a non-secure image, because the peripherals are secure. Signed-off-by: Sebastian Bøe <[email protected]> (cherry picked from commit e3e053f)
Noup as it patches code that does not exist in zephyr arch_busy_wait and k_busy_wait waited half the expected time due to SystemCoreClock being set back to the default value when ns builds. Changed to rely on device tree as to avoid hardcoded clock frequencies Signed-off-by: Dag Erik Gjørvad <[email protected]> (cherry picked from commit 665aba4)
Update path for autoconf.h which is now in zephyr/autoconf.h Signed-off-by: Frank Audun Kvamtrø <[email protected]> (cherry picked from commit 923f090)
…trollers Add a generic driver for MSPI controllers based on the DesignWare SSI core. With small vendor-specific adaptations covering integration details, it should be possible to use the driver for various devices. Upstream PR #: 80042 Signed-off-by: Andrzej Głąbek <[email protected]> (cherry picked from commit e957c23)
…devices Add a flash driver intended to handle various flash devices connected over MSPI bus as long as they support JEDEC SFDP. This is an initial commit providing only basic operations in Octal I/O mode with some hard-coded values for Macronix MX25Ux series chips. Upstream PR #: 80042 Signed-off-by: Andrzej Głąbek <[email protected]> (cherry picked from commit c6ace4b)
This is a follow-up to commit 45d827a. Although routing for those pins is configured via UICR, pinctrl still needs to be involved so that it is possible to set desired drive mode for them etc. Add also the missing RWDS pin. Upstream PR #: 80042 Applied as [nrf noup] due to a conflict in nrf-pinctrl.h Signed-off-by: Andrzej Głąbek <[email protected]>
…y map Access to this region must be requested through UICR by a local domain that want to use the Execute In Place (XIP) feature of the EXMIF peripheral. Upstream PR #: 80042 Signed-off-by: Andrzej Głąbek <[email protected]> (cherry picked from commit 71cc8b6)
… nRF54H20 DK Add nRF54H20 DK specific entries to allow using the sample on this board. Upstream PR #: 80042 Signed-off-by: Andrzej Głąbek <[email protected]> (cherry picked from commit 9edbdaf)
… template fixup! [nrf noup] tree-wide: support NCS Partition Manager (PM) definitions Signed-off-by: Torsten Rasmussen <[email protected]> (cherry picked from commit 7d364d0)
This is a follow-up to commit cdf45cb234077522b5cef2da084869af43d42dc1. Adjust the DTS node for the nRF EXMIF peripheral so that it is possible to handle the peripheral with the generic MSPI driver for DW SSI based controllers and use all its data lines in communication. Also adjust the related board files accordingly. Upstream PR #: 80042 Signed-off-by: Andrzej Głąbek <[email protected]> (cherry picked from commit 0b28040)
…mspi-nor" devices Extend several flash samples and tests so that they can also be used with "jedec,mspi-nor" devices. Add configurations needed for the nrf54h20dk/nrf54h20/cpuapp target. Upstream PR #: 80042 Signed-off-by: Andrzej Głąbek <[email protected]>
This commit brings back modifications from these reverted commits: - f68b2ed - e606246 slightly adjusted so that the EXMIF peripheral is still by default handled by the mspi_dw driver, and in cases where this driver cannot be used because something still does not work correctly, one can switch to the old solution based on the tweaked spi_dw driver. Signed-off-by: Andrzej Głąbek <[email protected]> (cherry picked from commit 352fb6b)
Do not delete clocks for the bsim target. Clocks are referenced by peripherals and it can be used to get frequency that clocks the peripheral. Upstream PR #: 82901 Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit fbc2ac0)
…ency to 64MHz" This reverts commit 413ca65. Upstream PR #: 82901 Signed-off-by: Andrzej Głąbek <[email protected]>
Add clock source to timers which indicates maximum frequency of the timer instance. Upstream PR #: 82901 Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit f5efb38)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.