riscv/sifive-blocks
1
0
Fork 0
Code Releases Activity

Merge pull request #30 from sifive/spi

Browse Source 
spi: Fix invalid D channel response when flash interface is disabled
This commit is contained in:
Albert Ou 2017-08-02 13:33:11 -09:00 committed by GitHub
commit 7f368987a8
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/scala/devices/spi/SPIFlash.scala
View File

@ -86,7 +86,7 @@ class SPIFlashMap(c: SPIFlashParamsBase) extends Module {
}
}
val (s_idle :: s_cmd :: s_addr :: s_pad :: s_data_pre :: s_data_post :: Nil) = Enum(UInt(), 6)
val (s_idle :: s_cmd :: s_addr :: s_pad :: s_data_pre :: s_data_post :: s_off :: Nil) = Enum(UInt(), 7)
val state = Reg(init = s_idle)
switch (state) {
@ -105,10 +105,11 @@ class SPIFlashMap(c: SPIFlashParamsBase) extends Module {
io.link.lock := Bool(false)
}
} .otherwise {
io.data.valid := io.addr.valid
io.addr.ready := io.data.ready
io.data.bits := UInt(0)
io.addr.ready := Bool(true)
io.link.lock := Bool(false)
when (io.addr.valid) {
state := s_off
}
}
}
@ -158,5 +159,13 @@ class SPIFlashMap(c: SPIFlashParamsBase) extends Module {
state := s_idle
}
}
is (s_off) {
io.data.valid := Bool(true)
io.data.bits := UInt(0)
when (io.data.ready) {
state := s_idle
}
}
}
}