srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

suservo: clkout and sdo[b-d] are inverted

This commit is contained in:
Robert Jördens 2018-05-11 16:15:18 +00:00
parent 04240cdc08
commit 74c0b4452b
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
artiq/gateware/suservo/pads.py
View File

@ -16,20 +16,23 @@ class SamplerPads(Module):
dn = platform.request("{}_adc_data_n".format(eem)) dn = platform.request("{}_adc_data_n".format(eem))
clkout_se = Signal() clkout_se = Signal()
clkout_inv = Signal()
sck = Signal() sck = Signal()
self.specials += [ self.specials += [
DifferentialOutput(self.cnv, cnv.p, cnv.n), DifferentialOutput(self.cnv, cnv.p, cnv.n),
DifferentialOutput(1, sdr.p, sdr.n), DifferentialOutput(1, sdr.p, sdr.n),
DDROutput(0, self.sck_en, sck, ClockSignal("rio_phy")), DDROutput(self.sck_en, 0, sck, ClockSignal("rio_phy")),
DifferentialOutput(sck, spip.clk, spin.clk), DifferentialOutput(sck, spip.clk, spin.clk),
DifferentialInput(dp.clkout, dn.clkout, clkout_se), DifferentialInput(dp.clkout, dn.clkout, clkout_se),
Instance("BUFR", i_I=clkout_se, o_O=self.clkout) # FIXME (hardware): CLKOUT is inverted
# (Sampler v2.0, v2.1) out on rising, in on falling
Instance("BUFR", i_I=clkout_se, o_O=clkout_inv)
] ]
self.comb += self.clkout.eq(~clkout_inv)
# here to be early before the input delays below to have the clock # define clock here before the input delays below
# available self.clkout_p = dp.clkout # available for false paths
self.clkout_p = dp.clkout # availabel for false paths
platform.add_platform_command( platform.add_platform_command(
"create_clock -name {clk} -period 8 [get_nets {clk}]", "create_clock -name {clk} -period 8 [get_nets {clk}]",
clk=dp.clkout) clk=dp.clkout)
@ -37,17 +40,20 @@ class SamplerPads(Module):
for i in "abcd": for i in "abcd":
sdo = Signal() sdo = Signal()
setattr(self, "sdo{}".format(i), sdo) setattr(self, "sdo{}".format(i), sdo)
if i != "a":
# FIXME (hardware): sdob, sdoc, sdod are inverted
# (Sampler v2.0, v2.1)
sdo, sdo_inv = Signal(), sdo
self.comb += sdo_inv.eq(~sdo)
sdop = getattr(dp, "sdo{}".format(i)) sdop = getattr(dp, "sdo{}".format(i))
sdon = getattr(dn, "sdo{}".format(i)) sdon = getattr(dn, "sdo{}".format(i))
self.specials += [ self.specials += [
DifferentialInput(sdop, sdon, sdo), DifferentialInput(sdop, sdon, sdo),
] ]
# 8, -0+1.5 hold (t_HSDO_DDR), -0.5+0.5 skew # -0+1.5 hold (t_HSDO_SDR), -0.5+0.5 skew
platform.add_platform_command( platform.add_platform_command(
"set_input_delay -clock {clk} " "set_input_delay -clock {clk} -max 2 [get_ports {port}]\n"
"-max 2 [get_ports {port}] -clock_fall\n" "set_input_delay -clock {clk} -min -0.5 [get_ports {port}]",
"set_input_delay -clock {clk} "
"-min -0.5 [get_ports {port}] -clock_fall",
clk=dp.clkout, port=sdop) clk=dp.clkout, port=sdop)