Skip to content

[nrf fromlist] Enable ADC testing on nrf54h20 cpuppr #3375

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 4 commits into from
Oct 9, 2025
Merged

[nrf fromlist] Enable ADC testing on nrf54h20 cpuppr #3375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed1cd0e
[nrf fromlist] boards: nordic: nrf54h20: Add adc to supported features
nordic-babu Oct 8, 2025
2b2043f
[nrf fromlist] tests: drivers: adc: Enable tests for nrf54h20 PPR.
nordic-babu Oct 7, 2025
8e5f785
[nrf fromlist] drivers: nrf: Add missing SoC header includes to adc a…
mib1-nordic Oct 7, 2025
b4503f7
[nrf fromlist] samples: drivers: adc: Enable samples for nrf54h20 PPR.
nordic-babu Oct 7, 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
1 change: 1 addition & 0 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_9_0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ sysbuild: true
ram: 62
flash: 62
supported:
- adc
- counter
- gpio
- i2c
Expand Down
1 change: 1 addition & 0 deletions drivers/adc/adc_nrfx_saadc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <zephyr/logging/log.h>
#include <zephyr/irq.h>
#include <dmm.h>
#include <soc.h>

LOG_MODULE_REGISTER(adc_nrfx_saadc, CONFIG_ADC_LOG_LEVEL);

Expand Down
1 change: 1 addition & 0 deletions drivers/i2s/i2s_nrf_tdm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <zephyr/kernel.h>
#include <zephyr/logging/log.h>
#include <dmm.h>
#include <soc.h>
#include <stdlib.h>

LOG_MODULE_REGISTER(tdm_nrf, CONFIG_I2S_LOG_LEVEL);
Expand Down
1 change: 1 addition & 0 deletions samples/drivers/adc/adc_dt/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ tests:
- nrf51dk/nrf51822
- nrf52840dk/nrf52840
- nrf54h20dk/nrf54h20/cpuapp
- nrf54h20dk/nrf54h20/cpuppr
- nrf54l15dk/nrf54l15/cpuapp
- nrf54lm20dk/nrf54lm20a/cpuapp
- ophelia4ev/nrf54l15/cpuapp
Expand Down
50 changes: 50 additions & 0 deletions samples/drivers/adc/adc_sequence/boards/nrf54h20dk_nrf54h20_common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* Copyright (c) 2025 Nordic Semiconductor ASA
*/

/ {
aliases {
adc0 = &adc;
};
};

&adc {
#address-cells = <1>;
#size-cells = <0>;

channel@0 {
reg = <0>;
zephyr,gain = "ADC_GAIN_1_2";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
zephyr,input-positive = <NRF_SAADC_AIN1>; /* P1.01 */
};

channel@1 {
reg = <1>;
zephyr,gain = "ADC_GAIN_1_2";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
zephyr,input-positive = <NRF_SAADC_AIN2>; /* P1.02 */
};

channel@2 {
reg = <2>;
zephyr,gain = "ADC_GAIN_1_2";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
zephyr,input-positive = <NRF_SAADC_AIN9>; /* P9.01 */
zephyr,vref-mv = <3686>; /* 3.6V * 1024 */
};

channel@7 {
reg = <7>;
zephyr,gain = "ADC_GAIN_1_2";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
zephyr,input-positive = <NRF_SAADC_AIN3>; /* P1.03 */
zephyr,input-negative = <NRF_SAADC_AIN7>; /* P1.07 */
};
};
45 changes: 1 addition & 44 deletions samples/drivers/adc/adc_sequence/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,4 @@
* Copyright (c) 2024 Nordic Semiconductor ASA
*/

/ {
aliases {
adc0 = &adc;
};
};

&adc {
#address-cells = <1>;
#size-cells = <0>;

channel@0 {
reg = <0>;
zephyr,gain = "ADC_GAIN_1_2";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
zephyr,input-positive = <NRF_SAADC_AIN1>; /* P1.01 */
};

channel@1 {
reg = <1>;
zephyr,gain = "ADC_GAIN_1_2";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
zephyr,input-positive = <NRF_SAADC_AIN2>; /* P1.02 */
};

channel@2 {
reg = <2>;
zephyr,gain = "ADC_GAIN_1_2";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
zephyr,input-positive = <NRF_SAADC_AIN9>; /* P9.01 */
zephyr,vref-mv = <3686>; /* 3.6V * 1024 */
};

channel@7 {
reg = <7>;
zephyr,gain = "ADC_GAIN_1_2";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
zephyr,input-positive = <NRF_SAADC_AIN3>; /* P1.03 */
zephyr,input-negative = <NRF_SAADC_AIN7>; /* P1.07 */
};
};
#include "nrf54h20dk_nrf54h20_common.dtsi"
11 changes: 11 additions & 0 deletions samples/drivers/adc/adc_sequence/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* Copyright (c) 2025 Nordic Semiconductor ASA
*/

#include "nrf54h20dk_nrf54h20_common.dtsi"

&adc {
status = "okay";
};
2 changes: 2 additions & 0 deletions samples/drivers/adc/adc_sequence/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ tests:
- cy8cproto_062_4343w
- nrf52840dk/nrf52840
- nrf54h20dk/nrf54h20/cpuapp
- nrf54h20dk/nrf54h20/cpuppr
- nrf54l15dk/nrf54l15/cpuapp
- nrf54lm20dk/nrf54lm20a/cpuapp
- ophelia4ev/nrf54l15/cpuapp
Expand All @@ -32,6 +33,7 @@ tests:
sample.drivers.adc.adc_sequence.8bit:
platform_allow:
- nrf54h20dk/nrf54h20/cpuapp
- nrf54h20dk/nrf54h20/cpuppr
- nrf54l15dk/nrf54l15/cpuapp
- nrf54lm20dk/nrf54lm20a/cpuapp
integration_platforms:
Expand Down
11 changes: 11 additions & 0 deletions .../drivers/adc/adc_sequence/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/*
* Copyright (c) 2025 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/
#include "../../../boards/nrf54h20dk_nrf54h20_common.dtsi"

&adc {
status = "reserved";
interrupt-parent = <&cpuppr_clic>;
};
1 change: 1 addition & 0 deletions samples/drivers/adc/adc_sequence/sysbuild/vpr_launcher/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# nothing here
1 change: 1 addition & 0 deletions tests/drivers/adc/adc_accuracy_test/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ tests:
- frdm_mcxc444
- nrf52840dk/nrf52840
- nrf54h20dk/nrf54h20/cpuapp
- nrf54h20dk/nrf54h20/cpuppr
- nrf54l15dk/nrf54l15/cpuapp
- nrf54lm20dk/nrf54lm20a/cpuapp
- ophelia4ev/nrf54l15/cpuapp
Expand Down
11 changes: 11 additions & 0 deletions tests/drivers/adc/adc_error_cases/boards/nrf54h20dk_nrf54h20_common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* Copyright (c) 2025 Nordic Semiconductor ASA
*/

/ {
aliases {
adc = &adc;
};
};
8 changes: 2 additions & 6 deletions tests/drivers/adc/adc_error_cases/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* Copyright (c) 2024 Nordic Semiconductor ASA
* Copyright (c) 2025 Nordic Semiconductor ASA
*/

/ {
aliases {
adc = &adc;
};
};
#include "nrf54h20dk_nrf54h20_common.dtsi"
11 changes: 11 additions & 0 deletions tests/drivers/adc/adc_error_cases/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* Copyright (c) 2025 Nordic Semiconductor ASA
*/

#include "nrf54h20dk_nrf54h20_common.dtsi"

&adc {
status = "okay";
};
1 change: 1 addition & 0 deletions tests/drivers/adc/adc_error_cases/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ tests:
- nrf54l15dk/nrf54l15/cpuapp
- nrf54lm20dk/nrf54lm20a/cpuapp
- nrf54h20dk/nrf54h20/cpuapp
- nrf54h20dk/nrf54h20/cpuppr
- ophelia4ev/nrf54l15/cpuapp
- xg24_rb4187c
- xg27_dk2602a
Expand Down