projects
/
sifive-blocks.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
9040498
)
Merge pull request #46 from sifive/gpio_iof_pueds
author
Megan Wachs
<megan@sifive.com>
Thu, 9 Nov 2017 01:18:02 +0000
(17:18 -0800)
committer
GitHub
<noreply@github.com>
Thu, 9 Nov 2017 01:18:02 +0000
(17:18 -0800)
GPIO: IOF should not override PUE and DS
src/main/scala/devices/mockaon/PMU.scala
patch
|
blob
|
history
diff --git
a/src/main/scala/devices/mockaon/PMU.scala
b/src/main/scala/devices/mockaon/PMU.scala
index 2020db7089b4183a0499d07e9986b791068169d1..bd9d339c27ac4e6e5ff5808c60222a65cb5c0c19 100644
(file)
--- a/
src/main/scala/devices/mockaon/PMU.scala
+++ b/
src/main/scala/devices/mockaon/PMU.scala
@@
-131,7
+131,9
@@
class PMU(val c: PMUConfig) extends Module {
val resetCauses = new ResetCauses().asInput
}
- val core = Module(new PMUCore(c)(resetIn = Reg(next = Reg(next = reset))))
+ val coreReset = Reg(next = Reg(next = reset))
+ val core = Module(new PMUCore(c)(resetIn = coreReset))
+
io <> core.io
core.io.wakeup.reset := false // this is implied by resetting the PMU