samples: drivers: jesd216: add support for Nordic QSPI driver

pabigot · nashif · commit 855b39ecbd4c · 2021-01-18T16:58:09.000-05:00
Remove the overlay and set up to enable the QSPI variant.

Signed-off-by: Peter Bigot &lt;peter.bigot@nordicsemi.no&gt;
diff --git a/samples/drivers/jesd216/boards/nrf52840dk_nrf52840.conf b/samples/drivers/jesd216/boards/nrf52840dk_nrf52840.conf
@@ -5,10 +5,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# Need this when storage is on MX25R64
-#CONFIG_NORDIC_QSPI_NOR=y
-#CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
-CONFIG_SPI=y
-CONFIG_SPI_NOR=y
-CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
-CONFIG_SPI_2=y
+CONFIG_SPI=n
+CONFIG_SPI_NOR=n
+CONFIG_NORDIC_QSPI_NOR=y
diff --git a/samples/drivers/jesd216/boards/nrf52840dk_nrf52840.overlay b/samples/drivers/jesd216/boards/nrf52840dk_nrf52840.overlay
diff --git a/samples/drivers/jesd216/src/main.c b/samples/drivers/jesd216/src/main.c
@@ -14,6 +14,8 @@
 
 #if DT_NODE_HAS_STATUS(DT_INST(0, jedec_spi_nor), okay)
 #define FLASH_DEVICE DT_LABEL(DT_INST(0, jedec_spi_nor))
+#elif DT_NODE_HAS_STATUS(DT_INST(0, nordic_qspi_nor), okay)
+#define FLASH_DEVICE DT_LABEL(DT_INST(0, nordic_qspi_nor))
 #else
 #error Unsupported flash driver
 #define FLASH_DEVICE ""
