Skip to content

Commit

Permalink
tests: drivers: spi: spi_error_cases: Improve nrf54h20dk cpuppr
Browse files Browse the repository at this point in the history
Rework overlays and add sysbuild/vpr_launcher folder to allow standard
test configuration for nrf54h20dk cpuppr.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
  • Loading branch information
nordic-krch committed Sep 11, 2024
1 parent 0086f57 commit 63b187c
Show file tree
Hide file tree
Showing 7 changed files with 98 additions and 159 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
/*
* Copyright (c) 2024 Nordic Semiconductor
*
* SPDX-License-Identifier: Apache-2.0
*/

&pinctrl {
spi130_default_alt: spi130_default_alt {
group1 {
psels = <NRF_PSEL(SPIM_SCK, 0, 0)>,
<NRF_PSEL(SPIM_MISO, 0, 6)>,
<NRF_PSEL(SPIM_MOSI, 0, 8)>;
};
};

spi130_sleep_alt: spi130_sleep_alt {
group1 {
psels = <NRF_PSEL(SPIM_SCK, 0, 0)>,
<NRF_PSEL(SPIM_MISO, 0, 6)>,
<NRF_PSEL(SPIM_MOSI, 0, 8)>;
low-power-enable;
};
};

spis131_default_alt: spis131_default_alt {
group1 {
psels = <NRF_PSEL(SPIS_SCK, 0, 1)>,
<NRF_PSEL(SPIS_MISO, 0, 7)>,
<NRF_PSEL(SPIS_MOSI, 0, 9)>,
<NRF_PSEL(SPIS_CSN, 0, 11)>;
};
};

spis131_sleep_alt: spis131_sleep_alt {
group1 {
psels = <NRF_PSEL(SPIS_SCK, 0, 1)>,
<NRF_PSEL(SPIS_MISO, 0, 7)>,
<NRF_PSEL(SPIS_MOSI, 0, 9)>,
<NRF_PSEL(SPIS_CSN, 0, 11)>;
low-power-enable;
};
};

};

&gpiote130 {
status = "okay";
};

&gpio0 {
status = "okay";
};

&spi130 {
compatible = "nordic,nrf-spim";
status = "okay";
pinctrl-0 = <&spi130_default_alt>;
pinctrl-1 = <&spi130_sleep_alt>;
pinctrl-names = "default", "sleep";
overrun-character = <0x00>;
cs-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
dut_spi_dt: test-spi-dev@0 {
compatible = "vnd,spi-device";
reg = <0>;
spi-max-frequency = <500000>;
};
};

dut_spis: &spi131 {
compatible = "nordic,nrf-spis";
status = "okay";
def-char = <0x00>;
pinctrl-0 = <&spis131_default_alt>;
pinctrl-1 = <&spis131_sleep_alt>;
pinctrl-names = "default", "sleep";
/delete-property/rx-delay-supported;
/delete-property/rx-delay;
};
Original file line number Diff line number Diff line change
Expand Up @@ -4,73 +4,12 @@
* SPDX-License-Identifier: Apache-2.0
*/

&pinctrl {
spi130_default_alt: spi130_default_alt {
group1 {
psels = <NRF_PSEL(SPIM_SCK, 0, 0)>,
<NRF_PSEL(SPIM_MOSI, 0, 8)>,
<NRF_PSEL(SPIM_MISO, 0, 6)>;
};
};

spi130_sleep_alt: spi130_sleep_alt {
group1 {
psels = <NRF_PSEL(SPIM_SCK, 0, 0)>,
<NRF_PSEL(SPIM_MISO, 0, 6)>,
<NRF_PSEL(SPIM_MOSI, 0, 8)>;
low-power-enable;
};
};

spis131_default_alt: spis131_default_alt {
group1 {
psels = <NRF_PSEL(SPIS_SCK, 0, 1)>,
<NRF_PSEL(SPIS_MISO, 0, 7)>,
<NRF_PSEL(SPIS_MOSI, 0, 9)>,
<NRF_PSEL(SPIS_CSN, 0, 11)>;
};
};

spis131_sleep_alt: spis131_sleep_alt {
group1 {
psels = <NRF_PSEL(SPIS_SCK, 0, 1)>,
<NRF_PSEL(SPIS_MISO, 0, 7)>,
<NRF_PSEL(SPIS_MOSI, 0, 9)>,
<NRF_PSEL(SPIS_CSN, 0, 11)>;
low-power-enable;
};
};

};

&gpio0 {
status = "okay";
};
#include "nrf54h20dk_nrf54h20_common.dtsi"

&spi130 {
compatible = "nordic,nrf-spim";
status = "okay";
pinctrl-0 = <&spi130_default_alt>;
pinctrl-1 = <&spi130_sleep_alt>;
pinctrl-names = "default", "sleep";
overrun-character = <0x00>;
cs-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
dut_spi_dt: test-spi-dev@0 {
compatible = "vnd,spi-device";
reg = <0>;
spi-max-frequency = <500000>;
};
memory-regions = <&cpuapp_dma_region>;
};

dut_spis: &spi131 {
compatible = "nordic,nrf-spis";
status = "okay";
def-char = <0x00>;
pinctrl-0 = <&spis131_default_alt>;
pinctrl-1 = <&spis131_sleep_alt>;
pinctrl-names = "default", "sleep";
memory-regions = <&cpuapp_dma_region>;
/delete-property/rx-delay-supported;
/delete-property/rx-delay;
};
Original file line number Diff line number Diff line change
Expand Up @@ -3,83 +3,4 @@
*
* SPDX-License-Identifier: Apache-2.0
*/

&pinctrl {
spi130_default_alt: spi130_default_alt {
group1 {
psels = <NRF_PSEL(SPIM_SCK, 0, 0)>,
<NRF_PSEL(SPIM_MOSI, 0, 8)>,
<NRF_PSEL(SPIM_MISO, 0, 6)>;
};
};

spi130_sleep_alt: spi130_sleep_alt {
group1 {
psels = <NRF_PSEL(SPIM_SCK, 0, 0)>,
<NRF_PSEL(SPIM_MISO, 0, 6)>,
<NRF_PSEL(SPIM_MOSI, 0, 8)>;
low-power-enable;
};
};

spis131_default_alt: spis131_default_alt {
group1 {
psels = <NRF_PSEL(SPIS_SCK, 0, 1)>,
<NRF_PSEL(SPIS_MISO, 0, 7)>,
<NRF_PSEL(SPIS_MOSI, 0, 9)>,
<NRF_PSEL(SPIS_CSN, 0, 11)>;
};
};

spis131_sleep_alt: spis131_sleep_alt {
group1 {
psels = <NRF_PSEL(SPIS_SCK, 0, 1)>,
<NRF_PSEL(SPIS_MISO, 0, 7)>,
<NRF_PSEL(SPIS_MOSI, 0, 9)>,
<NRF_PSEL(SPIS_CSN, 0, 11)>;
low-power-enable;
};
};

};

&gpio0 {
status = "okay";
};

&gpiote130 {
status = "okay";
owned-channels = <7>;
};

&cpuapp_dma_region {
status = "okay";
};

&spi130 {
compatible = "nordic,nrf-spim";
status = "okay";
pinctrl-0 = <&spi130_default_alt>;
pinctrl-1 = <&spi130_sleep_alt>;
pinctrl-names = "default", "sleep";
overrun-character = <0x00>;
cs-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
dut_spi_dt: test-spi-dev@0 {
compatible = "vnd,spi-device";
reg = <0>;
spi-max-frequency = <500000>;
};
memory-regions = <&cpuapp_dma_region>;
};

dut_spis: &spi131 {
compatible = "nordic,nrf-spis";
status = "okay";
def-char = <0x00>;
pinctrl-0 = <&spis131_default_alt>;
pinctrl-1 = <&spis131_sleep_alt>;
pinctrl-names = "default", "sleep";
memory-regions = <&cpuapp_dma_region>;
/delete-property/rx-delay-supported;
/delete-property/rx-delay;
};
#include "nrf54h20dk_nrf54h20_common.dtsi"
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/*
* Copyright (c) 2024 Nordic Semiconductor
*
* SPDX-License-Identifier: Apache-2.0
*/

#include "nrf54h20dk_nrf54h20_common.dtsi"

&spi130 {
memory-regions = <&cpurad_dma_region>;
};

dut_spis: &spi131 {
memory-regions = <&cpurad_dma_region>;
};
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,14 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
#include "../../../boards/nrf54h20dk_nrf54h20_common.dtsi"

&spi130 {
status = "reserved";
interrupt-parent = <&cpuppr_clic>;
};

&spi131 {
&dut_spis {
status = "reserved";
interrupt-parent = <&cpuppr_clic>;
};

&shared_ram3x_region {
status = "okay";
};

&gpio0 {
status = "reserved";
};
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# nothing here
8 changes: 0 additions & 8 deletions tests/drivers/spi/spi_error_cases/testcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,3 @@ tests:
extra_args: DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
platform_allow:
- nrf54h20dk/nrf54h20/cpuapp
drivers.spi.spi_error_cases.nrf54h20_cpuppr:
platform_allow: nrf54h20dk/nrf54h20/cpuppr
sysbuild: true
extra_args:
- vpr_launcher_DTC_OVERLAY_FILE="../../../tests/drivers/spi/spi_error_cases/boards/nrf54h20dk_nrf54h20_cpuppr_launcher.overlay"
- SB_CONFIG_VPR_LAUNCHER=y
# Disable asserts to fit in limited code memory
- CONFIG_ASSERT=n

0 comments on commit 63b187c

Please sign in to comment.