nrf/qspi: set correct config for flash chip in the nrf52840dk

2 files changed, 14 insertions, 9 deletions

diff --git a/embassy-nrf-examples/src/bin/qspi.rs b/embassy-nrf-examples/src/bin/qspi.rs
index 1f33192e9..6e49887a4 100644
--- a/embassy-nrf-examples/src/bin/qspi.rs
+++ b/embassy-nrf-examples/src/bin/qspi.rs
@@ -24,16 +24,17 @@ struct AlignedBuf([u8; 4096]);
 
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
-    let csn = p.P0_17;
-    let sck = p.P0_19;
-    let io0 = p.P0_20;
-    let io1 = p.P0_21;
-    let io2 = p.P0_22;
-    let io3 = p.P0_23;
-
-    let config = qspi::Config::default();
+    // Config for the MX25R64 present in the nRF52840 DK
+    let mut config = qspi::Config::default();
+    config.read_opcode = qspi::ReadOpcode::READ4IO;
+    config.write_opcode = qspi::WriteOpcode::PP4IO;
+    config.write_page_size = qspi::WritePageSize::_256BYTES;
+
     let irq = interrupt::take!(QSPI);
-    let mut q = qspi::Qspi::new(p.QSPI, irq, sck, csn, io0, io1, io2, io3, config).await;
+    let mut q = qspi::Qspi::new(
+        p.QSPI, irq, p.P0_19, p.P0_17, p.P0_20, p.P0_21, p.P0_22, p.P0_23, config,
+    )
+    .await;
 
     let mut id = [1; 3];
     q.custom_instruction(0x9F, &[], &mut id).await.unwrap();
diff --git a/embassy-nrf-examples/src/bin/qspi_lowpower.rs b/embassy-nrf-examples/src/bin/qspi_lowpower.rs
index 9bbc87caa..ece3243b6 100644
--- a/embassy-nrf-examples/src/bin/qspi_lowpower.rs
+++ b/embassy-nrf-examples/src/bin/qspi_lowpower.rs
@@ -27,7 +27,11 @@ async fn main(_spawner: Spawner, mut p: Peripherals) {
     let mut irq = interrupt::take!(QSPI);
 
     loop {
+        // Config for the MX25R64 present in the nRF52840 DK
         let mut config = qspi::Config::default();
+        config.read_opcode = qspi::ReadOpcode::READ4IO;
+        config.write_opcode = qspi::WriteOpcode::PP4IO;
+        config.write_page_size = qspi::WritePageSize::_256BYTES;
         config.deep_power_down = Some(qspi::DeepPowerDownConfig {
             enter_time: 3, // tDP = 30uS
             exit_time: 3,  // tRDP = 35uS