From 5642feb8244d3e66e3289799e3e1459e677a71cb Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Thu, 28 Nov 2019 03:02:51 +0100
Subject: [PATCH] zynq::flash: add missing config bits to enable addressing
 mode

---
 src/zynq/flash/mod.rs  | 36 +++++++++++++++++++++++++++---------
 src/zynq/flash/regs.rs |  5 ++++-
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/zynq/flash/mod.rs b/src/zynq/flash/mod.rs
index 3043563..4fe09f7 100644
--- a/src/zynq/flash/mod.rs
+++ b/src/zynq/flash/mod.rs
@@ -1,5 +1,6 @@
 //! Quad-SPI Flash Controller
 
+use core::marker::PhantomData;
 use crate::regs::{RegisterW, RegisterRW};
 use super::slcr;
 use super::clocks::CpuClocks;
@@ -8,23 +9,25 @@ pub mod regs;
 
 const FLASH_BAUD_RATE: u32 = 50_000_000;
 
+pub struct LinearAddressing;
+
 /// Flash Interface Driver
 ///
 /// For 2x Spansion S25FL128SAGMFIR01
-pub struct Flash {
+pub struct Flash<MODE> {
     regs: &'static mut regs::RegisterBlock,
+    _mode: PhantomData<MODE>,
 }
 
-impl Flash {
+impl Flash<()> {
     pub fn new(clock: u32) -> Self {
         Self::enable_clocks(clock);
         Self::setup_signals();
         Self::reset();
 
         let regs = regs::RegisterBlock::qspi();
-        let mut flash = Flash { regs };
+        let mut flash = Flash { regs, _mode: PhantomData };
         flash.configure((FLASH_BAUD_RATE - 1 + clock) / FLASH_BAUD_RATE);
-        flash.setup_linear_addressing_mode();
         flash
     }
 
@@ -106,25 +109,40 @@ impl Flash {
             baud_rate_div += 1;
         }
 
-        self.regs.config.modify(|_, w| w
+        self.regs.config.write(regs::Config::zeroed()
             .baud_rate_div(baud_rate_div as u8)
             .mode_sel(true)
             .leg_flsh(true)
-            .endian(false)
             .fifo_width(0b11)
         );
     }
 
-    fn setup_linear_addressing_mode(&mut self) {
-        self.regs.lqspi_cfg.modify(|_, w| w
+    pub fn linear_addressing_mode(self) -> Flash<LinearAddressing> {
+        // Set manual start enable to auto mode.
+        // Assert the chip select.
+        self.regs.config.modify(|_, w| w
+            .man_start_en(false)
+            .pcs(false)
+        );
+
+        self.regs.lqspi_cfg.write(regs::LqspiCfg::zeroed()
             .inst_code(0x3)
             .u_page(false)
             .sep_bus(false)
             .two_mem(false)
             .lq_mode(true)
         );
-    }
 
+        self.regs.enable.modify(|_, w| w.spi_en(true));
+
+        Flash {
+            regs: self.regs,
+            _mode: PhantomData,
+        }
+    }
+}
+
+impl Flash<LinearAddressing> {
     pub fn ptr<T>(&mut self) -> *mut T {
         0xFC00_0000 as *mut _
     }
diff --git a/src/zynq/flash/regs.rs b/src/zynq/flash/regs.rs
index 955d1c4..0ea2cfd 100644
--- a/src/zynq/flash/regs.rs
+++ b/src/zynq/flash/regs.rs
@@ -9,7 +9,7 @@ pub struct RegisterBlock {
     pub intr_en: RW<u32>,
     pub intr_dis: RW<u32>,
     pub intr_mask: RO<u32>,
-    pub enable: RW<u32>,
+    pub enable: Enable,
     pub delay: RW<u32>,
     pub txd0: WO<u32>,
     pub rx_data: RO<u32>,
@@ -77,6 +77,9 @@ register_bit!(config,
               /// false: legacy SPI mode, true: Flash memory interface mode
               leg_flsh, 31);
 
+register!(enable, Enable, RW, u32);
+register_bit!(enable, spi_en, 0);
+
 register!(lqspi_cfg, LqspiCfg, RW, u32);
 register_bits!(lqspi_cfg, inst_code, u8, 0, 7);
 register_bits!(lqspi_cfg, dummy_byte, u8, 8, 10);