Hardware
/
liteeth
mirror of https://github.com/enjoy-digital/liteeth.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

phy/ecp5rgmii: Review/cleanup tx_clk addition.

This commit is contained in:
Florent Kermarrec 2023-07-03 19:10:42 +02:00
parent 8ae7649d03
commit f8594ae429
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
liteeth/phy/ecp5rgmii.py
View File

@ -148,7 +148,7 @@ class LiteEthPHYRGMIIRX(LiteXModule):
# LiteEth PHY RGMII CRG ---------------------------------------------------------------------------- # LiteEth PHY RGMII CRG ----------------------------------------------------------------------------
class LiteEthPHYRGMIICRG(LiteXModule): class LiteEthPHYRGMIICRG(LiteXModule):
def __init__(self, clock_pads, pads, with_hw_init_reset, tx_delay=2e-9, with_phy_tx_clock = None): def __init__(self, clock_pads, pads, with_hw_init_reset, tx_delay=2e-9, tx_clk=None):
self._reset = CSRStorage() self._reset = CSRStorage()
# # # # # #
@ -159,13 +159,10 @@ class LiteEthPHYRGMIICRG(LiteXModule):
# TX Clock # TX Clock
self.cd_eth_tx = ClockDomain() self.cd_eth_tx = ClockDomain()
if isinstance(tx_clk, Signal):
if isinstance(with_phy_tx_clock, Signal): self.comb += self.cd_eth_tx.clk.eq(tx_clk)
phy_tx_clock = with_phy_tx_clock
else: else:
phy_tx_clock = self.cd_eth_rx.clk self.comb += self.cd_eth_tx.clk.eq(self.cd_eth_rx.clk)
self.comb += self.cd_eth_tx.clk.eq(phy_tx_clock)
tx_delay_taps = int(tx_delay/25e-12) # 25ps per tap tx_delay_taps = int(tx_delay/25e-12) # 25ps per tap
assert tx_delay_taps < 128 assert tx_delay_taps < 128
@ -209,9 +206,9 @@ class LiteEthPHYRGMII(LiteXModule):
tx_delay = 2e-9, tx_delay = 2e-9,
rx_delay = 2e-9, rx_delay = 2e-9,
with_inband_status = True, with_inband_status = True,
with_phy_tx_clock = None tx_clk = None,
): ):
self.crg = LiteEthPHYRGMIICRG(clock_pads, pads, with_hw_init_reset, tx_delay, with_phy_tx_clock) self.crg = LiteEthPHYRGMIICRG(clock_pads, pads, with_hw_init_reset, tx_delay, tx_clk)
self.tx = ClockDomainsRenamer("eth_tx")(LiteEthPHYRGMIITX(pads)) self.tx = ClockDomainsRenamer("eth_tx")(LiteEthPHYRGMIITX(pads))
self.rx = ClockDomainsRenamer("eth_rx")(LiteEthPHYRGMIIRX(pads, rx_delay, with_inband_status)) self.rx = ClockDomainsRenamer("eth_rx")(LiteEthPHYRGMIIRX(pads, rx_delay, with_inband_status))
self.sink, self.source = self.tx.sink, self.rx.source self.sink, self.source = self.tx.sink, self.rx.source