From: Megan Wachs <megan@sifive.com>
Date: Thu, 9 Nov 2017 01:18:02 +0000 (-0800)
Subject: Merge pull request #46 from sifive/gpio_iof_pueds
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9052a079d404ebbfda5f01765b909c20503504ad;hp=90404980b8941846f4372a85a9a489d1c52b641a;p=sifive-blocks.git

Merge pull request #46 from sifive/gpio_iof_pueds

GPIO: IOF should not override PUE and DS
---

diff --git a/src/main/scala/devices/mockaon/PMU.scala b/src/main/scala/devices/mockaon/PMU.scala
index 2020db7..bd9d339 100644
--- 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