diff --git a/samples/drivers/spi_flash/boards/nrf52840_pca10056.conf b/samples/drivers/spi_flash/boards/nrf52840_pca10056.conf
index b6858c7306d..c483efdb826 100644
--- a/samples/drivers/spi_flash/boards/nrf52840_pca10056.conf
+++ b/samples/drivers/spi_flash/boards/nrf52840_pca10056.conf
@@ -1,7 +1,8 @@
 #
 # Copyright (c) 2019 Peter Bigot Consulting, LLC
+# Copyright (c) 2019 Nordic Semiconductor ASA
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
-CONFIG_SPI_NOR=y
+CONFIG_NORDIC_QSPI_NOR=y
diff --git a/samples/drivers/spi_flash/src/main.c b/samples/drivers/spi_flash/src/main.c
index 1cf53f47cf8..a4ad09115e7 100644
--- a/samples/drivers/spi_flash/src/main.c
+++ b/samples/drivers/spi_flash/src/main.c
@@ -17,6 +17,9 @@
 #elif (CONFIG_SPI_NOR - 0) || defined(DT_INST_0_JEDEC_SPI_NOR_LABEL)
 #define FLASH_DEVICE DT_INST_0_JEDEC_SPI_NOR_LABEL
 #define FLASH_NAME "JEDEC SPI-NOR"
+#elif (CONFIG_NORDIC_QSPI_NOR - 0) || defined(DT_INST_0_NORDIC_QSPI_NOR_LABEL)
+#define FLASH_DEVICE DT_INST_0_NORDIC_QSPI_NOR_LABEL
+#define FLASH_NAME "JEDEC QSPI-NOR"
 #else
 #error Unsupported flash driver
 #endif
diff --git a/samples/subsys/fs/littlefs/boards/nrf52840_pca10056.conf b/samples/subsys/fs/littlefs/boards/nrf52840_pca10056.conf
index 339d2b51a78..086d0b5ac6a 100644
--- a/samples/subsys/fs/littlefs/boards/nrf52840_pca10056.conf
+++ b/samples/subsys/fs/littlefs/boards/nrf52840_pca10056.conf
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2019 Peter Bigot Consulting, LLC
+# Copyright (c) 2019 Nordic Semiconductor ASA
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -8,6 +9,5 @@
 CONFIG_MPU_ALLOW_FLASH_WRITE=y
 
 # Need this when storage is on MX25R64
-CONFIG_SPI=y
-CONFIG_SPI_NOR=y
-CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
+CONFIG_NORDIC_QSPI_NOR=y
+CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
diff --git a/tests/subsys/fs/littlefs/boards/nrf52840_pca10056.conf b/tests/subsys/fs/littlefs/boards/nrf52840_pca10056.conf
index 317cd8f29db..8c83bde31c2 100644
--- a/tests/subsys/fs/littlefs/boards/nrf52840_pca10056.conf
+++ b/tests/subsys/fs/littlefs/boards/nrf52840_pca10056.conf
@@ -1,8 +1,9 @@
 #
 # Copyright (c) 2019 Peter Bigot Consulting, LLC
+# Copyright (c) 2019 Nordic Semiconductor ASA
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-CONFIG_SPI=y
-CONFIG_SPI_NOR=y
-CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
+
+CONFIG_NORDIC_QSPI_NOR=y
+CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
diff --git a/tests/subsys/settings/littlefs/base64/boards/nrf52840_pca10056.conf b/tests/subsys/settings/littlefs/base64/boards/nrf52840_pca10056.conf
index 50aa4071b8e..f38428b5d3d 100644
--- a/tests/subsys/settings/littlefs/base64/boards/nrf52840_pca10056.conf
+++ b/tests/subsys/settings/littlefs/base64/boards/nrf52840_pca10056.conf
@@ -1,6 +1,5 @@
  # SPDX-License-Identifier: Apache-2.0
  # Copyright (c) 2019 Nordic Semiconductor ASA
 
-CONFIG_SPI=y
-CONFIG_SPI_NOR=y
-CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
+CONFIG_NORDIC_QSPI_NOR=y
+CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
diff --git a/tests/subsys/settings/littlefs/raw/boards/nrf52840_pca10056.conf b/tests/subsys/settings/littlefs/raw/boards/nrf52840_pca10056.conf
index 50aa4071b8e..f38428b5d3d 100644
--- a/tests/subsys/settings/littlefs/raw/boards/nrf52840_pca10056.conf
+++ b/tests/subsys/settings/littlefs/raw/boards/nrf52840_pca10056.conf
@@ -1,6 +1,5 @@
  # SPDX-License-Identifier: Apache-2.0
  # Copyright (c) 2019 Nordic Semiconductor ASA
 
-CONFIG_SPI=y
-CONFIG_SPI_NOR=y
-CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
+CONFIG_NORDIC_QSPI_NOR=y
+CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096