phy/ecp5ddrphy: cosmetics.

This commit is contained in:
Florent Kermarrec 2020-04-15 15:05:57 +02:00
parent f68f1ddfad
commit e2b4c2bfa1
1 changed files with 20 additions and 10 deletions

View File

@ -143,7 +143,7 @@ class ECP5DDRPHY(Module, AutoCSR):
for pads_group in range(len(pads.groups)): for pads_group in range(len(pads.groups)):
pads.sel_group(pads_group) pads.sel_group(pads_group)
# Clock ------------------------------------------------------------------------------------ # Clock --------------------------------------------------------------------------------
for i in range(len(pads.clk_p)): for i in range(len(pads.clk_p)):
sd_clk_se = Signal() sd_clk_se = Signal()
self.specials += Instance("ODDRX2F", self.specials += Instance("ODDRX2F",
@ -157,7 +157,7 @@ class ECP5DDRPHY(Module, AutoCSR):
o_Q = pads.clk_p[i] o_Q = pads.clk_p[i]
) )
# Addresses and Commands ------------------------------------------------------------------- # Addresses and Commands ---------------------------------------------------------------
for i in range(addressbits): for i in range(addressbits):
self.specials += Instance("ODDRX2F", self.specials += Instance("ODDRX2F",
i_RST = ResetSignal("sys2x"), i_RST = ResetSignal("sys2x"),
@ -281,10 +281,15 @@ class ECP5DDRPHY(Module, AutoCSR):
dm_o_data_d = Signal(8) dm_o_data_d = Signal(8)
dm_o_data_muxed = Signal(4) dm_o_data_muxed = Signal(4)
self.comb += dm_o_data.eq(Cat( self.comb += dm_o_data.eq(Cat(
dfi.phases[0].wrdata_mask[0*databits//8+i], dfi.phases[0].wrdata_mask[1*databits//8+i], dfi.phases[0].wrdata_mask[0*databits//8+i],
dfi.phases[0].wrdata_mask[2*databits//8+i], dfi.phases[0].wrdata_mask[3*databits//8+i], dfi.phases[0].wrdata_mask[1*databits//8+i],
dfi.phases[1].wrdata_mask[0*databits//8+i], dfi.phases[1].wrdata_mask[1*databits//8+i], dfi.phases[0].wrdata_mask[2*databits//8+i],
dfi.phases[1].wrdata_mask[2*databits//8+i], dfi.phases[1].wrdata_mask[3*databits//8+i]), dfi.phases[0].wrdata_mask[3*databits//8+i],
dfi.phases[1].wrdata_mask[0*databits//8+i],
dfi.phases[1].wrdata_mask[1*databits//8+i],
dfi.phases[1].wrdata_mask[2*databits//8+i],
dfi.phases[1].wrdata_mask[3*databits//8+i]),
) )
self.sync += dm_o_data_d.eq(dm_o_data) self.sync += dm_o_data_d.eq(dm_o_data)
self.sync += \ self.sync += \
@ -341,10 +346,15 @@ class ECP5DDRPHY(Module, AutoCSR):
dq_o_data_d = Signal(8) dq_o_data_d = Signal(8)
dq_o_data_muxed = Signal(4) dq_o_data_muxed = Signal(4)
self.comb += dq_o_data.eq(Cat( self.comb += dq_o_data.eq(Cat(
dfi.phases[0].wrdata[0*databits+j], dfi.phases[0].wrdata[1*databits+j], dfi.phases[0].wrdata[0*databits+j],
dfi.phases[0].wrdata[2*databits+j], dfi.phases[0].wrdata[3*databits+j], dfi.phases[0].wrdata[1*databits+j],
dfi.phases[1].wrdata[0*databits+j], dfi.phases[1].wrdata[1*databits+j], dfi.phases[0].wrdata[2*databits+j],
dfi.phases[1].wrdata[2*databits+j], dfi.phases[1].wrdata[3*databits+j]) dfi.phases[0].wrdata[3*databits+j],
dfi.phases[1].wrdata[0*databits+j],
dfi.phases[1].wrdata[1*databits+j],
dfi.phases[1].wrdata[2*databits+j],
dfi.phases[1].wrdata[3*databits+j])
) )
self.sync += dq_o_data_d.eq(dq_o_data) self.sync += dq_o_data_d.eq(dq_o_data)
self.sync += \ self.sync += \