phy/100basex: Rename crg_reset to reset.

liteeth/phy/a7_1000basex.py

@@ -40,7 +40,7 @@ def __init__(self, qpll_channel, data_pads, sys_clk_freq, with_csr=True, rx_pola
         self.txoutclk = Signal()
         self.rxoutclk = Signal()
 
-        self.crg_reset = Signal()
+        self.reset = Signal()
         if with_csr:
             self.add_csr()
 
@@ -720,7 +720,7 @@ def __init__(self, qpll_channel, data_pads, sys_clk_freq, with_csr=True, rx_pola
         self.comb += [
             qpll_channel.reset.eq(tx_init.qpll_reset),
             tx_init.qpll_lock.eq(qpll_channel.lock),
-            tx_reset.eq(tx_init.tx_reset | self.crg_reset)
+            tx_reset.eq(tx_init.tx_reset | self.reset)
         ]
         self.sync += tx_mmcm_reset.eq(~qpll_channel.lock)
         tx_mmcm_reset.attr.add("no_retiming")
@@ -729,7 +729,7 @@ def __init__(self, qpll_channel, data_pads, sys_clk_freq, with_csr=True, rx_pola
         self.submodules += rx_init
         self.comb += [
             rx_init.enable.eq(tx_init.done),
-            rx_reset.eq(rx_init.rx_reset | self.crg_reset),
+            rx_reset.eq(rx_init.rx_reset | self.reset),
 
             rx_init.rx_pma_reset_done.eq(rx_pma_reset_done),
             drpaddr.eq(rx_init.drpaddr),
@@ -774,5 +774,5 @@ def __init__(self, qpll_channel, data_pads, sys_clk_freq, with_csr=True, rx_pola
         ]
 
     def add_csr(self):
-        self._crg_reset = CSRStorage()
-        self.comb += self.crg_reset.eq(self._crg_reset.storage)
+        self._reset = CSRStorage()
+        self.comb += self.reset.eq(self._reset.storage)

liteeth/phy/k7_1000basex.py

@@ -41,7 +41,7 @@ def __init__(self, refclk_or_clk_pads, data_pads, sys_clk_freq, with_csr=True, r
         self.txoutclk = Signal()
         self.rxoutclk = Signal()
 
-        self.crg_reset = Signal()
+        self.reset = Signal()
         if with_csr:
             self.add_csr()
 
@@ -741,7 +741,7 @@ def __init__(self, refclk_or_clk_pads, data_pads, sys_clk_freq, with_csr=True, r
         tx_init = ResetInserter()(GTXTXInit(sys_clk_freq, buffer_enable=True))
         self.submodules += tx_init
         self.comb += [
-            tx_init.reset.eq(self.crg_reset),
+            tx_init.reset.eq(self.reset),
             pll.reset.eq(tx_init.pllreset),
             tx_init.plllock.eq(pll.lock),
             tx_reset.eq(tx_init.gtXxreset),
@@ -754,7 +754,7 @@ def __init__(self, refclk_or_clk_pads, data_pads, sys_clk_freq, with_csr=True, r
         rx_init = ResetInserter()(GTXRXInit(sys_clk_freq, buffer_enable=True))
         self.submodules += rx_init
         self.comb += [
-            rx_init.reset.eq(~tx_init.done | self.crg_reset),
+            rx_init.reset.eq(~tx_init.done | self.reset),
             rx_init.plllock.eq(pll.lock),
             rx_reset.eq(rx_init.gtXxreset),
             rx_init.Xxresetdone.eq(rx_reset_done),
@@ -794,5 +794,5 @@ def __init__(self, refclk_or_clk_pads, data_pads, sys_clk_freq, with_csr=True, r
         ]
 
     def add_csr(self):
-        self._crg_reset = CSRStorage()
-        self.comb += self.crg_reset.eq(self._crg_reset.storage)
+        self._reset = CSRStorage()
+        self.comb += self.reset.eq(self._reset.storage)

liteeth/phy/ku_1000basex.py

@@ -38,7 +38,7 @@ def __init__(self, refclk_or_clk_pads, data_pads, sys_clk_freq, with_csr=True, r
         self.txoutclk = Signal()
         self.rxoutclk = Signal()
 
-        self.crg_reset = Signal()
+        self.reset = Signal()
         if with_csr:
             self.add_csr()
 
@@ -837,8 +837,8 @@ def __init__(self, refclk_or_clk_pads, data_pads, sys_clk_freq, with_csr=True, r
             )
         ]
         self.comb += [
-            tx_reset.eq(pll_reset | ~pll_locked | self.crg_reset),
-            rx_reset.eq(pll_reset | ~pll_locked | pcs.restart | self.crg_reset)
+            tx_reset.eq(pll_reset | ~pll_locked | self.reset),
+            rx_reset.eq(pll_reset | ~pll_locked | pcs.restart | self.reset)
         ]
 
         # Gearbox and PCS connection
@@ -852,5 +852,5 @@ def __init__(self, refclk_or_clk_pads, data_pads, sys_clk_freq, with_csr=True, r
         ]
 
     def add_csr(self):
-        self._crg_reset = CSRStorage()
-        self.comb += self.crg_reset.eq(self._crg_reset.storage)
+        self._reset = CSRStorage()
+        self.comb += self.reset.eq(self._reset.storage)

liteeth/phy/usp_gth_1000basex.py

@@ -39,7 +39,7 @@ def __init__(self, refclk_or_clk_pads, data_pads, sys_clk_freq, refclk_freq=200e
         self.txoutclk = Signal()
         self.rxoutclk = Signal()
 
-        self.crg_reset = Signal()
+        self.reset = Signal()
         if with_csr:
             self.add_csr()
 
@@ -901,8 +901,8 @@ def __init__(self, refclk_or_clk_pads, data_pads, sys_clk_freq, refclk_freq=200e
             )
         ]
         self.comb += [
-            tx_reset.eq(pll_reset | ~pll_locked | self.crg_reset),
-            rx_reset.eq(pll_reset | ~pll_locked | pcs.restart | self.crg_reset)
+            tx_reset.eq(pll_reset | ~pll_locked | self.reset),
+            rx_reset.eq(pll_reset | ~pll_locked | pcs.restart | self.reset)
         ]
 
         # Gearbox and PCS connection
@@ -917,5 +917,5 @@ def __init__(self, refclk_or_clk_pads, data_pads, sys_clk_freq, refclk_freq=200e
 
 
     def add_csr(self):
-        self._crg_reset = CSRStorage()
-        self.comb += self.crg_reset.eq(self._crg_reset.storage)
+        self._reset = CSRStorage()
+        self.comb += self.reset.eq(self._reset.storage)

liteeth/phy/usp_gty_1000basex.py

@@ -39,7 +39,7 @@ def __init__(self, refclk_or_clk_pads, data_pads, sys_clk_freq, refclk_freq=200e
         self.txoutclk = Signal()
         self.rxoutclk = Signal()
 
-        self.crg_reset = Signal()
+        self.reset = Signal()
         if with_csr:
             self.add_csr()
 
@@ -946,8 +946,8 @@ def __init__(self, refclk_or_clk_pads, data_pads, sys_clk_freq, refclk_freq=200e
             )
         ]
         self.comb += [
-            tx_reset.eq(pll_reset | ~pll_locked | self.crg_reset),
-            rx_reset.eq(pll_reset | ~pll_locked | pcs.restart | self.crg_reset)
+            tx_reset.eq(pll_reset | ~pll_locked | self.reset),
+            rx_reset.eq(pll_reset | ~pll_locked | pcs.restart | self.reset)
         ]
 
         # Gearbox and PCS connection
@@ -961,5 +961,5 @@ def __init__(self, refclk_or_clk_pads, data_pads, sys_clk_freq, refclk_freq=200e
         ]
 
     def add_csr(self):
-        self._crg_reset = CSRStorage()
-        self.comb += self.crg_reset.eq(self._crg_reset.storage)
+        self._reset = CSRStorage()
+        self.comb += self.reset.eq(self._reset.storage)