M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

drtio/transceiver/gtp_7series_init: remove dead code

This commit is contained in:
Florent Kermarrec 2018-02-19 10:02:23 +01:00
parent 782051f474
commit 89a158c0c9
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
artiq/gateware/drtio/transceiver/gtp_7series.py
View File

@ -39,8 +39,7 @@ class GTPSingle(Module):
self.comb += [ self.comb += [
tx_init.stable_clkin.eq(self.stable_clkin), tx_init.stable_clkin.eq(self.stable_clkin),
qpll_channel.reset.eq(tx_init.pllreset), qpll_channel.reset.eq(tx_init.pllreset),
tx_init.plllock.eq(qpll_channel.lock), tx_init.plllock.eq(qpll_channel.lock)
rx_init.plllock.eq(qpll_channel.lock),
] ]
txdata = Signal(20) txdata = Signal(20)

9
artiq/gateware/drtio/transceiver/gtp_7series_init.py
View File

@ -146,7 +146,6 @@ class GTPRXInit(Module):
self.restart = Signal() self.restart = Signal()
# GTP signals # GTP signals
self.plllock = Signal()
self.gtrxreset = Signal() self.gtrxreset = Signal()
self.gtrxreset.attr.add("no_retiming") self.gtrxreset.attr.add("no_retiming")
self.gtrxpd = Signal() self.gtrxpd = Signal()
@ -185,12 +184,10 @@ class GTPRXInit(Module):
self.sync += rxpmaresetdone_r.eq(rxpmaresetdone) self.sync += rxpmaresetdone_r.eq(rxpmaresetdone)
# Double-latch transceiver asynch outputs # Double-latch transceiver asynch outputs
plllock = Signal()
rxresetdone = Signal() rxresetdone = Signal()
rxdlysresetdone = Signal() rxdlysresetdone = Signal()
rxsyncdone = Signal() rxsyncdone = Signal()
self.specials += [ self.specials += [
MultiReg(self.plllock, plllock),
MultiReg(self.rxresetdone, rxresetdone), MultiReg(self.rxresetdone, rxresetdone),
MultiReg(self.rxdlysresetdone, rxdlysresetdone), MultiReg(self.rxdlysresetdone, rxdlysresetdone),
MultiReg(self.rxsyncdone, rxsyncdone) MultiReg(self.rxsyncdone, rxsyncdone)
@ -212,12 +209,6 @@ class GTPRXInit(Module):
self.rxuserrdy.eq(rxuserrdy) self.rxuserrdy.eq(rxuserrdy)
] ]
# After configuration, transceiver resets have to stay low for
# at least 500ns (see AR43482)
pll_reset_cycles = ceil(500e-9*sys_clk_freq)
pll_reset_timer = WaitTimer(pll_reset_cycles)
self.submodules += pll_reset_timer
startup_fsm = ResetInserter()(FSM(reset_state="GTP_PD")) startup_fsm = ResetInserter()(FSM(reset_state="GTP_PD"))
self.submodules += startup_fsm self.submodules += startup_fsm