From 0d7639d0659f58249a3032f868455ff30241d687 Mon Sep 17 00:00:00 2001
From: Ella Schwarz <schwarzem@a6.Millennium.Berkeley.EDU>
Date: Mon, 1 Jan 2024 13:16:53 -0800
Subject: [PATCH] fix naming

---
 .../chipyard/src/main/scala/config/AbstractConfig.scala      | 5 ++---
 .../chipyard/src/main/scala/harness/HarnessBinders.scala     | 4 ++--
 generators/chipyard/src/main/scala/iobinders/IOBinders.scala | 2 +-
 generators/testchipip                                        | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/generators/chipyard/src/main/scala/config/AbstractConfig.scala b/generators/chipyard/src/main/scala/config/AbstractConfig.scala
index afdb673b2b..8cd26eb681 100644
--- a/generators/chipyard/src/main/scala/config/AbstractConfig.scala
+++ b/generators/chipyard/src/main/scala/config/AbstractConfig.scala
@@ -23,7 +23,7 @@ class AbstractConfig extends Config(
   new chipyard.harness.WithTieOffInterrupts ++                     // tie-off interrupt ports, if present
   new chipyard.harness.WithTieOffL2FBusAXI ++                      // tie-off external AXI4 master, if present
   new chipyard.harness.WithCustomBootPinPlusArg ++                 // drive custom-boot pin with a plusarg, if custom-boot-pin is present
-  new chipyard.harness.WithChipIdPinFromHarness ++                 // drive chip id pin with a plusarg, if chip id pin is present
+  new chipyard.harness.WithDriveChipIdPin ++                       // drive chip id pin from harness binder, if chip id pin is present
   new chipyard.harness.WithSimUARTToUARTTSI ++                     // connect a SimUART to the UART-TSI port
   new chipyard.harness.WithClockFromHarness ++                     // all Clock I/O in ChipTop should be driven by harnessClockInstantiator
   new chipyard.harness.WithResetFromHarness ++                     // reset controlled by harness
@@ -37,7 +37,7 @@ class AbstractConfig extends Config(
   new chipyard.iobinders.WithGPIOCells ++
   new chipyard.iobinders.WithSPIFlashIOCells ++
   new chipyard.iobinders.WithExtInterruptIOCells ++
-  new chipyard.iobinders.WithChipIdPin ++
+  new chipyard.iobinders.WithChipIdIOCells ++
   new chipyard.iobinders.WithCustomBootPin ++
   // The "punchthrough" IOBInders below don't generate IOCells, as these interfaces shouldn't really be mapped to ASIC IO
   // Instead, they directly pass through the DigitalTop ports to ports in the ChipTop
@@ -63,7 +63,6 @@ class AbstractConfig extends Config(
   new chipyard.config.WithFrontBusFrequency(500.0) ++               // Default 500 MHz fbus
   new chipyard.config.WithOffchipBusFrequency(500.0) ++             // Default 500 MHz obus
 
-  new testchipip.soc.WithChipIdPin ++                               // add a chip id pin for setting chip id in multi-chip configs
   new testchipip.boot.WithCustomBootPin ++                          // add a custom-boot-pin to support pin-driven boot address
   new testchipip.boot.WithBootAddrReg ++                            // add a boot-addr-reg for configurable boot address
   new testchipip.serdes.WithSerialTL(Seq(                           // add a serial-tilelink interface
diff --git a/generators/chipyard/src/main/scala/harness/HarnessBinders.scala b/generators/chipyard/src/main/scala/harness/HarnessBinders.scala
index 7f91166baf..4a12af7ba2 100644
--- a/generators/chipyard/src/main/scala/harness/HarnessBinders.scala
+++ b/generators/chipyard/src/main/scala/harness/HarnessBinders.scala
@@ -237,8 +237,8 @@ class WithSimTSIOverSerialTL extends HarnessBinder({
   }
 })
 
-//TODO: Allow setting from harness with chipId argument, hardcoding is temporary hack
-class WithChipIdPinFromHarness extends HarnessBinder({
+//TODO: Set with chipId argument to harness binder, hardcoding is temporary hack
+class WithDriveChipIdPin extends HarnessBinder({
   case (th: HasHarnessInstantiators, port: ChipIdPort) => {
     port.io := 0.U
   }
diff --git a/generators/chipyard/src/main/scala/iobinders/IOBinders.scala b/generators/chipyard/src/main/scala/iobinders/IOBinders.scala
index bc9162fa8b..e49d835606 100644
--- a/generators/chipyard/src/main/scala/iobinders/IOBinders.scala
+++ b/generators/chipyard/src/main/scala/iobinders/IOBinders.scala
@@ -353,7 +353,7 @@ class WithSerialTLIOCells extends OverrideIOBinder({
   }
 })
 
-class WithChipIdPin extends OverrideIOBinder({
+class WithChipIdIOCells extends OverrideIOBinder({
   (system: CanHavePeripheryChipIdPin) => system.chip_id_pin.map({ p =>
     val sys = system.asInstanceOf[BaseSubsystem]
     val (port, cells) = IOCell.generateIOFromSignal(p.getWrappedValue, s"chip_id", sys.p(IOCellKey), abstractResetAsAsync = true)
diff --git a/generators/testchipip b/generators/testchipip
index 15955a5fb9..d7c22bee71 160000
--- a/generators/testchipip
+++ b/generators/testchipip
@@ -1 +1 @@
-Subproject commit 15955a5fb9772af71e4898fdd9173c9c2521d390
+Subproject commit d7c22bee711807d02704d22e95d8a9a2cc423d4e