diff --git a/generators/chipyard/src/main/scala/iobinders/IOBinders.scala b/generators/chipyard/src/main/scala/iobinders/IOBinders.scala
index 64b1296e6a..80723b6106 100644
--- a/generators/chipyard/src/main/scala/iobinders/IOBinders.scala
+++ b/generators/chipyard/src/main/scala/iobinders/IOBinders.scala
@@ -174,6 +174,7 @@ class WithGPIOCells extends OverrideIOBinder({
         iocell.io.oe := pin.o.oe
         iocell.io.ie := pin.o.ie
         pin.i.ival := iocell.io.i
+        pin.i.po.foreach(_ := DontCare)
         iocell.io.pad <> g
         (GPIOPort(() => g, i, j), iocell)
       }).unzip
diff --git a/generators/rocket-chip-blocks b/generators/rocket-chip-blocks
index 340b78158c..f9263535be 160000
--- a/generators/rocket-chip-blocks
+++ b/generators/rocket-chip-blocks
@@ -1 +1 @@
-Subproject commit 340b78158c6aa022461f9a3bf5d838ec158b64c8
+Subproject commit f9263535be1988778f1baf98c18221dee1db1a47