Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modules: hal_nordic: multi-instance DPPI minor fixes #81602

Open
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

e-rk
Copy link
Collaborator

@e-rk e-rk commented Nov 19, 2024

Addressed remaining comments from PR #79857

Added a Kconfig value that allows for changing the resource reservation header file.

The resource reservation header is now included according to a Kconfig
value. The Kconfig can be overriden out-of-tree in case a different
header is needed.

Signed-off-by: Rafał Kuźnia <[email protected]>
Changed the CMakeLists to enable the nrfx_gppi utilities based solely on
the CONFIG_NRFX_GPPI Kconfig. This unifies the configuration on all nRF
SoC families.

Signed-off-by: Rafał Kuźnia <[email protected]>
The NRF54L_SERIES define is more specific and should be used in favor of
LUMOS_XXAA.

Signed-off-by: Rafał Kuźnia <[email protected]>
Added dppic0 node label, alongside the dppic to maintain backward
compatibility. The use of dppic0 is preferred.

Signed-off-by: Rafał Kuźnia <[email protected]>
@zephyrbot zephyrbot added the platform: nRF Nordic nRFx label Nov 19, 2024
e-rk added a commit to e-rk/sdk-zephyr that referenced this pull request Nov 19, 2024
…ader

The resource reservation header is now included according to a Kconfig
value. The Kconfig can be overriden out-of-tree in case a different
header is needed.

Upstream PR: zephyrproject-rtos/zephyr#81602

Signed-off-by: Rafał Kuźnia <[email protected]>
e-rk added a commit to e-rk/sdk-zephyr that referenced this pull request Nov 19, 2024
Changed the CMakeLists to enable the nrfx_gppi utilities based solely on
the CONFIG_NRFX_GPPI Kconfig. This unifies the configuration on all nRF
SoC families.

Upstream PR: zephyrproject-rtos/zephyr#81602

Signed-off-by: Rafał Kuźnia <[email protected]>
e-rk added a commit to e-rk/sdk-zephyr that referenced this pull request Nov 19, 2024
The NRF54L_SERIES define is more specific and should be used in favor of
LUMOS_XXAA.

Upstream PR: zephyrproject-rtos/zephyr#81602

Signed-off-by: Rafał Kuźnia <[email protected]>
e-rk added a commit to e-rk/sdk-zephyr that referenced this pull request Nov 19, 2024
Added dppic0 node label, alongside the dppic to maintain backward
compatibility. The use of dppic0 is preferred.

Upstream PR: zephyrproject-rtos/zephyr#81602

Signed-off-by: Rafał Kuźnia <[email protected]>
e-rk added a commit to e-rk/sdk-zephyr that referenced this pull request Nov 19, 2024
…ader

The resource reservation header is now included according to a Kconfig
value. The Kconfig can be overriden out-of-tree in case a different
header is needed.

Upstream PR: zephyrproject-rtos/zephyr#81602

Signed-off-by: Rafał Kuźnia <[email protected]>
e-rk added a commit to e-rk/sdk-zephyr that referenced this pull request Nov 19, 2024
Changed the CMakeLists to enable the nrfx_gppi utilities based solely on
the CONFIG_NRFX_GPPI Kconfig. This unifies the configuration on all nRF
SoC families.

Upstream PR: zephyrproject-rtos/zephyr#81602

Signed-off-by: Rafał Kuźnia <[email protected]>
e-rk added a commit to e-rk/sdk-zephyr that referenced this pull request Nov 19, 2024
The NRF54L_SERIES define is more specific and should be used in favor of
LUMOS_XXAA.

Upstream PR: zephyrproject-rtos/zephyr#81602

Signed-off-by: Rafał Kuźnia <[email protected]>
e-rk added a commit to e-rk/sdk-zephyr that referenced this pull request Nov 19, 2024
Added dppic0 node label, alongside the dppic to maintain backward
compatibility. The use of dppic0 is preferred.

Upstream PR: zephyrproject-rtos/zephyr#81602

Signed-off-by: Rafał Kuźnia <[email protected]>
e-rk added a commit to e-rk/sdk-zephyr that referenced this pull request Nov 19, 2024
…tforms

Changed the CMakeLists to enable the nrfx_gppi utilities based solely on
the CONFIG_NRFX_GPPI Kconfig. This unifies the configuration on all nRF
SoC families.

Upstream PR: zephyrproject-rtos/zephyr#81602

Signed-off-by: Rafał Kuźnia <[email protected]>
e-rk added a commit to e-rk/sdk-zephyr that referenced this pull request Nov 19, 2024
…RIES

The NRF54L_SERIES define is more specific and should be used in favor of
LUMOS_XXAA.

Upstream PR: zephyrproject-rtos/zephyr#81602

Signed-off-by: Rafał Kuźnia <[email protected]>
e-rk added a commit to e-rk/sdk-zephyr that referenced this pull request Nov 19, 2024
Added dppic0 node label, alongside the dppic to maintain backward
compatibility. The use of dppic0 is preferred.

Upstream PR: zephyrproject-rtos/zephyr#81602

Signed-off-by: Rafał Kuźnia <[email protected]>
Copy link
Collaborator

@bjarki-andreasen bjarki-andreasen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice :)

Comment on lines +34 to +35
depends on ($(dt_nodelabel_has_compat,dppic,$(DT_COMPAT_NORDIC_NRF_DPPIC)) || \
$(dt_nodelabel_has_compat,dppic0,$(DT_COMPAT_NORDIC_NRF_DPPIC)))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no need to check both these labels. dppic0 is enough.

Suggested change
depends on ($(dt_nodelabel_has_compat,dppic,$(DT_COMPAT_NORDIC_NRF_DPPIC)) || \
$(dt_nodelabel_has_compat,dppic0,$(DT_COMPAT_NORDIC_NRF_DPPIC)))
depends $(dt_nodelabel_has_compat,dppic0,$(DT_COMPAT_NORDIC_NRF_DPPIC))

@@ -314,7 +314,9 @@ void nrfx_busy_wait(uint32_t usec_to_wait);

/*------------------------------------------------------------------------------*/

#include "nrfx_config_reserved_resources.h"
#ifdef CONFIG_NRFX_RESERVED_RESOURCES_HEADER
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it actually possible that this will not be defined?

@sachinthegreen sachinthegreen removed their request for review November 26, 2024 09:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
platform: nRF Nordic nRFx
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants