Skip to content

Backport #21430 #21620

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
Apr 11, 2025
Merged

Backport #21430 #21620

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
24f225e
drivers: mspi: Add shim driver for sQSPI
anangl Apr 3, 2025
6d8c155
tests: zephyr: flash: common: Add scenario for sQSPI on nRF54L15 DK
anangl Apr 4, 2025
f897214
samples: zephyr: drivers: Add sQSPI scenario for spi_flash and jesd216
anangl Apr 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
2 changes: 2 additions & 0 deletions CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,9 @@
/samples/zephyr/drivers/adc/ @nrfconnect/ncs-low-level-test
/samples/zephyr/drivers/audio/dmic/ @nrfconnect/ncs-low-level-test
/samples/zephyr/drivers/i2c/rtio_loopback/ @nrfconnect/ncs-low-level-test
/samples/zephyr/drivers/jesd216/ @nrfconnect/ncs-low-level-test
/samples/zephyr/drivers/mbox/ @nrfconnect/ncs-low-level-test
/samples/zephyr/drivers/spi_flash/ @nrfconnect/ncs-low-level-test
/samples/zephyr/drivers/watchdog/ @nrfconnect/ncs-low-level-test
/samples/zephyr/sensor/accel_polling/ @nrfconnect/ncs-low-level-test
/samples/zephyr/sensor/bme680/ @nrfconnect/ncs-low-level-test
Expand Down
24 changes: 24 additions & 0 deletions drivers/mspi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,27 @@

zephyr_library_amend()
zephyr_library_sources_ifdef(CONFIG_MSPI_NRFE mspi_nrfe.c)

if(CONFIG_MSPI_NRF_SQSPI)
set(SP_DIR ${ZEPHYR_NRFXLIB_MODULE_DIR}/softperipheral)
set(SQSPI_DIR ${SP_DIR}/sQSPI)

zephyr_library_compile_definitions(
NRFX_QSPI2_ENABLED=1
NRFX_QSPI2_MAX_NUM_DATA_LINES=4
)
zephyr_library_include_directories(
${SP_DIR}/include
${SQSPI_DIR}/include
)
zephyr_library_include_directories_ifdef(CONFIG_SOC_NRF54L15
${SQSPI_DIR}/include/nrf54l15
)
zephyr_library_include_directories_ifdef(CONFIG_SOC_NRF54H20
${SQSPI_DIR}/include/nrf54h20
)
zephyr_library_sources(
${SQSPI_DIR}/src/nrfx_qspi2.c
mspi_sqspi.c
)
endif()
1 change: 1 addition & 0 deletions drivers/mspi/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
if MSPI

rsource "Kconfig.nrfe"
rsource "Kconfig.sqspi"

endif # MSPI
9 changes: 9 additions & 0 deletions drivers/mspi/Kconfig.sqspi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Copyright (c) 2025 Nordic Semiconductor ASA
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause

config MSPI_NRF_SQSPI
bool "sQSPI driver"
default y
depends on DT_HAS_NORDIC_NRF_SQSPI_ENABLED
select PINCTRL
select GPIO if $(dt_compat_any_has_prop,$(DT_COMPAT_NORDIC_NRF_SQSPI),ce-gpios)
Loading