Skip to content

Conversation

@anhmolt
Copy link
Contributor

@anhmolt anhmolt commented Nov 13, 2025

@anhmolt anhmolt added this to the v1.0.0 milestone Nov 13, 2025
@anhmolt anhmolt requested a review from a team as a code owner November 13, 2025 12:51
@anhmolt anhmolt added the DNM Do not merge label Nov 13, 2025
@anhmolt anhmolt requested review from a team as code owners November 13, 2025 12:51
@github-actions github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Nov 13, 2025
@NordicBuilder
Copy link

NordicBuilder commented Nov 13, 2025

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff
nrf nrfconnect/sdk-nrf@ae7ecb7 nrfconnect/[email protected] nrfconnect/[email protected]

All manifest checks OK

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@github-actions
Copy link

You can find the documentation preview for this PR here.

@NordicBuilder NordicBuilder requested a review from a team November 13, 2025 15:58
@anhmolt anhmolt force-pushed the update-to-nrfx-4.0 branch 3 times, most recently from fb3fad3 to 52b0f13 Compare November 20, 2025 15:28
@anhmolt anhmolt changed the title [WiP] Update to nrfx 4.0 Migrate to nrfx 4.0 Nov 21, 2025
Copy link
Contributor

@MirkoCovizzi MirkoCovizzi left a comment

Choose a reason for hiding this comment

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

Gave a cursory look and it looks quite good to me.

nrfx_uarte_t *uarte_inst;
/* Uarte instance configuration. */
nrfx_uarte_config_t uarte_cfg;
/* gpiote instances. */
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: Gpiote instances. Same above.

@ankuns
Copy link
Contributor

ankuns commented Nov 27, 2025

@anhmolt please rebase, the #499 PR has just been merged.

@ankuns
Copy link
Contributor

ankuns commented Nov 27, 2025

I'll align the NFC

@ankuns
Copy link
Contributor

ankuns commented Nov 28, 2025

@anhmolt The PR nrfconnect/sdk-nrf#25376 is already merged

@NordicBuilder NordicBuilder removed the DNM Do not merge label Nov 28, 2025
@anhmolt
Copy link
Contributor Author

anhmolt commented Nov 28, 2025

@anhmolt The PR nrfconnect/sdk-nrf#25376 is already merged

Thanks. Updated sdk-nrf manifest revision to SHA.

LOG_MODULE_REGISTER(nfc_platform, CONFIG_NFC_PLATFORM_LOG_LEVEL);

#if NRF54L_ERRATA_60_ENABLE_WORKAROUND
#define NFC_PLATFORM_USE_TIMER_WORKAROUND 1
Copy link
Contributor

Choose a reason for hiding this comment

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

we don't really indent #if

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

Copy link
Contributor

Choose a reason for hiding this comment

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

fixed

#endif

#if NFC_PLATFORM_USE_TIMER_WORKAROUND
#define NFC_TIMER_IRQn NRFX_CONCAT_3(TIMER, \
Copy link
Contributor

Choose a reason for hiding this comment

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

the spacing here looks to be bit like a tab has been used, when a space would be fine?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

Copy link
Contributor

Choose a reason for hiding this comment

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

fixed

Copy link
Contributor

@nordicjm nordicjm left a comment

Choose a reason for hiding this comment

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

Comments are nit.

@anhmolt anhmolt force-pushed the update-to-nrfx-4.0 branch from ff8a0ac to 44133e0 Compare December 1, 2025 08:38
@ankuns ankuns force-pushed the update-to-nrfx-4.0 branch from 44133e0 to 24f5be4 Compare December 1, 2025 08:39
@NordicBuilder NordicBuilder added the DNM Do not merge label Dec 1, 2025
@anhmolt
Copy link
Contributor Author

anhmolt commented Dec 1, 2025

Updated sdk-nrf revision in west.yml to v3.2.0-rc1.

@anhmolt anhmolt force-pushed the update-to-nrfx-4.0 branch from 24f5be4 to 44133e0 Compare December 1, 2025 08:46
@NordicBuilder NordicBuilder removed the DNM Do not merge label Dec 1, 2025
Remove unused nrf.h header includes in preparation for nrfx 4.0.

Signed-off-by: Andreas Moltumyr <[email protected]>
Update code to use nrfx 4.0.

* Changed error returns from nrfx_error_t to errno.
* Removed usage of NRFX_xxx_INST_HANDLER_GET.
* Removed use of nrfx_uarte_rx (previously deprecated).
* Macro NRFX_xxx_INSTANCE now expects the peripheral's base
  address instead of instance number.
* Updated the nrf-bm specific hal_nordic Kconfig file.
* Change name of clock power handler in irq_connect to
  avoid a name clash.
* The nfc_platform.h API in sdk-nrfxlib changed. Align
  implementation of nfc_bm_platform.c to the required API changes.
  (The alignment is based on sdk-nrf PR # 25376 to the
  subsys/nfc/lib/platform.c)
  Additionally, the NFC_PLATFORM_USE_TIMER_WORKAROUND is provided
  when nrfx define NRF54L_ERRATA_60_ENABLE_WORKAROUND.

Signed-off-by: Andreas Moltumyr <[email protected]>
Signed-off-by: Andrzej Kuros <[email protected]>
@anhmolt anhmolt force-pushed the update-to-nrfx-4.0 branch from 44133e0 to 3b11dd9 Compare December 1, 2025 12:18
@anhmolt
Copy link
Contributor Author

anhmolt commented Dec 1, 2025

rebased

Copy link
Contributor

@ankuns ankuns left a comment

Choose a reason for hiding this comment

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

NFC look OK.

@eivindj-nordic eivindj-nordic merged commit 0bacda1 into nrfconnect:main Dec 1, 2025
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. manifest manifest-nrf

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants