diff --git a/generators/chipyard/src/main/scala/clocking/CanHaveClockTap.scala b/generators/chipyard/src/main/scala/clocking/CanHaveClockTap.scala
index 5d0ce538..9af30ddf 100644
--- a/generators/chipyard/src/main/scala/clocking/CanHaveClockTap.scala
+++ b/generators/chipyard/src/main/scala/clocking/CanHaveClockTap.scala
@@ -13,10 +13,10 @@ import freechips.rocketchip.prci._
 case object ClockTapKey extends Field[Boolean](true)
 
 trait CanHaveClockTap { this: BaseSubsystem =>
-  require(p(SubsystemDriveAsyncClockGroupsKey).isEmpty, "Subsystem asyncClockGroups must be undriven")
+  require(!p(SubsystemDriveClockGroupsFromIO), "Subsystem must not drive clocks from IO")
   val clockTapNode = Option.when(p(ClockTapKey)) {
     val clockTap = ClockSinkNode(Seq(ClockSinkParameters(name=Some("clock_tap"))))
-    clockTap := ClockGroup() := asyncClockGroupsNode
+    clockTap := ClockGroup() := allClockGroupsNode
     clockTap
   }
   val clockTapIO = clockTapNode.map { node => InModuleBody {