Skip to content

manifest: sdk-zephyr: [nrf fromlist] update hal_nordic revision to integrate nrfx 3.12.0 #22603

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jun 5, 2025
+15 −6
Merged

manifest: sdk-zephyr: [nrf fromlist] update hal_nordic revision to integrate nrfx 3.12.0 #22603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f29811a
manifest: Update sdk-zephyr revision (auto-manifest PR)
NordicBuilder Jun 2, 2025
b3b0e20
tests: drivers: adc: nrf54lv10a: align to non-gain configuration
nika-nordic Jun 3, 2025
ce1f8cc
samples: direct_test_mode: align to DFE GPIO equal to `7`
nika-nordic Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions samples/bluetooth/direct_test_mode/src/dtm_hw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,13 @@ const int8_t nrf_power_value[] = {
/* Run a macro 'fn' on each available DFE GPIO index, from 0 to
* MAX_DFE_GPIO-1, with the given parenthesized separator.
*/
#define FOR_EACH_DFE_GPIO(fn, sep) \
FOR_EACH(fn, sep, 0, 1, 2, 3, 4, 5, 6, 7)
#if DTM_HW_MAX_DFE_GPIO == 8
#define FOR_EACH_DFE_GPIO(fn, sep) FOR_EACH(fn, sep, 0, 1, 2, 3, 4, 5, 6, 7)
#elif DTM_HW_MAX_DFE_GPIO == 7
#define FOR_EACH_DFE_GPIO(fn, sep) FOR_EACH(fn, sep, 0, 1, 2, 3, 4, 5, 6)
#else
#error "Unsupported DFE GPIO count"
#endif

/* The number of dfegpio[n]-gpios properties which are set. */
#define DFE_GPIO_NUM (FOR_EACH_DFE_GPIO(HAS_DFE_GPIO, (+)))
Expand Down
4 changes: 4 additions & 0 deletions samples/bluetooth/direct_test_mode/src/dtm_hw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ extern "C" {
#endif

/* Number of PSEL_DFEGPIO[n] registers in the radio peripheral. */
#if defined(RADIO_PSEL_DFEGPIO_MaxCount)
#define DTM_HW_MAX_DFE_GPIO RADIO_PSEL_DFEGPIO_MaxCount
#else
#define DTM_HW_MAX_DFE_GPIO 8
#endif

/* Indicates that GPIO pin is not connected to the radio */
#define DTM_HW_DFE_PSEL_NOT_SET 0xFF
Expand Down
2 changes: 1 addition & 1 deletion tests/zephyr/drivers/adc/adc_accuracy_test/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

channel@0 {
reg = <0>;
zephyr,gain = "ADC_GAIN_1_2";
zephyr,gain = "ADC_GAIN_1";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
zephyr,input-positive = <NRF_SAADC_AIN2>;
Expand Down
4 changes: 2 additions & 2 deletions tests/zephyr/drivers/adc/adc_api/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

channel@1 {
reg = <1>;
zephyr,gain = "ADC_GAIN_1_4";
zephyr,gain = "ADC_GAIN_1";
zephyr,reference = "ADC_REF_EXTERNAL0";
zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
zephyr,input-positive = <NRF_SAADC_AIN4>;
Expand All @@ -35,7 +35,7 @@

channel@2 {
reg = <2>;
zephyr,gain = "ADC_GAIN_2_3";
zephyr,gain = "ADC_GAIN_1";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
zephyr,input-positive = <NRF_SAADC_AIN2>;
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 247ef302c2269d63b8957e5a346ab42a5f0b3bc8
revision: 63b28baebfc909e707d34c9d41f5fd4ef7aa47c7
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading