From c3ebafa6ed0c25fda78afc82cc3fd3eabe4c0897 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Mon, 6 Apr 2020 22:02:10 +0200
Subject: [PATCH] libboard_zynq: fix flash read

---
 libboard_zynq/src/flash/mod.rs  | 22 +++++++++++++---------
 libboard_zynq/src/flash/regs.rs |  2 +-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/libboard_zynq/src/flash/mod.rs b/libboard_zynq/src/flash/mod.rs
index 3d2df2a..3a39c0e 100644
--- a/libboard_zynq/src/flash/mod.rs
+++ b/libboard_zynq/src/flash/mod.rs
@@ -22,7 +22,10 @@ pub const PAGE_SIZE: u32 = 0x100;
 
 /// Instruction: Read Identification
 const INST_RDID: u8 = 0x9F;
+/// Instruction: Read
 const INST_READ: u8 = 0x03;
+/// Instruction: Quad I/O Fast Read
+const INST_4IO_FAST_READ: u8 = 0xEB;
 /// Instruction: Write Disable
 const INST_WRDI: u8 = 0x04;
 /// Instruction: Write Enable
@@ -291,14 +294,14 @@ impl Flash<()> {
 
         self.regs.lqspi_cfg.write(regs::LqspiCfg::zeroed()
             // Quad I/O Fast Read
-            .inst_code(0xEB)
+            .inst_code(INST_4IO_FAST_READ)
+            .dummy_mask(0x2)
+            .mode_en(false)
             .mode_bits(0xFF)
-            .dummy_byte(0x2)
-            .mode_en(true)
             // 2 devices
             .two_mem(true)
             .u_page(false)
-            // Linear Addressing Mode
+            // Quad SPI mode
             .lq_mode(true)
         );
 
@@ -318,14 +321,15 @@ impl Flash<()> {
         );
 
         self.regs.lqspi_cfg.write(regs::LqspiCfg::zeroed()
+            // Quad I/O Fast Read
+            .inst_code(INST_READ)
+            .dummy_mask(0x2)
+            .mode_en(false)
             .mode_bits(0xFF)
-            .dummy_byte(0x2)
-            .mode_en(true)
             // 2 devices
             .two_mem(true)
-            .sep_bus(true)
-            .u_page(chip_index != 0)
-            // Manual I/O mode
+            .u_page(false)
+            // Quad SPI mode
             .lq_mode(false)
         );
 
diff --git a/libboard_zynq/src/flash/regs.rs b/libboard_zynq/src/flash/regs.rs
index a62d811..f98eb47 100644
--- a/libboard_zynq/src/flash/regs.rs
+++ b/libboard_zynq/src/flash/regs.rs
@@ -116,7 +116,7 @@ register_bit!(qspi_gpio,
 
 register!(lqspi_cfg, LqspiCfg, RW, u32);
 register_bits!(lqspi_cfg, inst_code, u8, 0, 7);
-register_bits!(lqspi_cfg, dummy_byte, u8, 8, 10);
+register_bits!(lqspi_cfg, dummy_mask, u8, 8, 10);
 register_bits!(lqspi_cfg, mode_bits, u8, 16, 23);
 register_bit!(lqspi_cfg, mode_on, 24);
 register_bit!(lqspi_cfg, mode_en, 25);