mirror of
https://github.com/saymrwulf/litex-boards.git
synced 2026-11-20 09:52:57 +00:00
targets/ecp5/ddr3: Uniformize cd_sys2x (reset_less).
This commit is contained in:
parent
9d452b0d74
commit
2a206def0f
10 changed files with 19 additions and 28 deletions
|
|
@ -29,7 +29,7 @@ class _CRG(Module):
|
||||||
self.clock_domains.cd_init = ClockDomain()
|
self.clock_domains.cd_init = ClockDomain()
|
||||||
self.clock_domains.cd_por = ClockDomain(reset_less=True)
|
self.clock_domains.cd_por = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_sys = ClockDomain()
|
self.clock_domains.cd_sys = ClockDomain()
|
||||||
self.clock_domains.cd_sys2x = ClockDomain()
|
self.clock_domains.cd_sys2x = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True)
|
self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True)
|
||||||
|
|
||||||
# # #
|
# # #
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ class _CRG(Module):
|
||||||
self.clock_domains.cd_init = ClockDomain()
|
self.clock_domains.cd_init = ClockDomain()
|
||||||
self.clock_domains.cd_por = ClockDomain(reset_less=True)
|
self.clock_domains.cd_por = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_sys = ClockDomain()
|
self.clock_domains.cd_sys = ClockDomain()
|
||||||
self.clock_domains.cd_sys2x = ClockDomain()
|
self.clock_domains.cd_sys2x = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True)
|
self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True)
|
||||||
|
|
||||||
self.stop = Signal()
|
self.stop = Signal()
|
||||||
|
|
@ -71,7 +71,6 @@ class _CRG(Module):
|
||||||
i_RST = self.reset,
|
i_RST = self.reset,
|
||||||
o_CDIVX = self.cd_sys.clk),
|
o_CDIVX = self.cd_sys.clk),
|
||||||
AsyncResetSynchronizer(self.cd_sys, ~pll.locked | self.reset),
|
AsyncResetSynchronizer(self.cd_sys, ~pll.locked | self.reset),
|
||||||
AsyncResetSynchronizer(self.cd_sys2x, ~pll.locked | self.reset),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
# BaseSoC ------------------------------------------------------------------------------------------
|
# BaseSoC ------------------------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@ class _CRG(Module):
|
||||||
self.clock_domains.cd_init = ClockDomain()
|
self.clock_domains.cd_init = ClockDomain()
|
||||||
self.clock_domains.cd_por = ClockDomain(reset_less=True)
|
self.clock_domains.cd_por = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_sys = ClockDomain()
|
self.clock_domains.cd_sys = ClockDomain()
|
||||||
self.clock_domains.cd_sys2x = ClockDomain()
|
self.clock_domains.cd_sys2x = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True)
|
self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True)
|
||||||
|
|
||||||
# # #
|
# # #
|
||||||
|
|
@ -75,7 +75,6 @@ class _CRG(Module):
|
||||||
i_RST = self.reset,
|
i_RST = self.reset,
|
||||||
o_CDIVX = self.cd_sys.clk),
|
o_CDIVX = self.cd_sys.clk),
|
||||||
AsyncResetSynchronizer(self.cd_sys, ~pll.locked | self.reset),
|
AsyncResetSynchronizer(self.cd_sys, ~pll.locked | self.reset),
|
||||||
AsyncResetSynchronizer(self.cd_sys2x, ~pll.locked | self.reset),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
# BaseSoC ------------------------------------------------------------------------------------------
|
# BaseSoC ------------------------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,7 @@ class _CRGSDRAM(Module):
|
||||||
self.clock_domains.cd_init = ClockDomain()
|
self.clock_domains.cd_init = ClockDomain()
|
||||||
self.clock_domains.cd_por = ClockDomain(reset_less=True)
|
self.clock_domains.cd_por = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_sys = ClockDomain()
|
self.clock_domains.cd_sys = ClockDomain()
|
||||||
self.clock_domains.cd_sys2x = ClockDomain()
|
self.clock_domains.cd_sys2x = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True)
|
self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True)
|
||||||
|
|
||||||
# # #
|
# # #
|
||||||
|
|
@ -121,7 +121,6 @@ class _CRGSDRAM(Module):
|
||||||
i_RST = self.reset,
|
i_RST = self.reset,
|
||||||
o_CDIVX = self.cd_sys.clk),
|
o_CDIVX = self.cd_sys.clk),
|
||||||
AsyncResetSynchronizer(self.cd_sys, ~pll.locked | self.reset),
|
AsyncResetSynchronizer(self.cd_sys, ~pll.locked | self.reset),
|
||||||
AsyncResetSynchronizer(self.cd_sys2x, ~pll.locked | self.reset),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
# USB PLL
|
# USB PLL
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ class _CRG(Module):
|
||||||
self.clock_domains.cd_init = ClockDomain()
|
self.clock_domains.cd_init = ClockDomain()
|
||||||
self.clock_domains.cd_por = ClockDomain(reset_less=True)
|
self.clock_domains.cd_por = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_sys = ClockDomain()
|
self.clock_domains.cd_sys = ClockDomain()
|
||||||
self.clock_domains.cd_sys2x = ClockDomain()
|
self.clock_domains.cd_sys2x = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True)
|
self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True)
|
||||||
|
|
||||||
# # #
|
# # #
|
||||||
|
|
@ -69,8 +69,7 @@ class _CRG(Module):
|
||||||
i_CLKI = self.cd_sys2x.clk,
|
i_CLKI = self.cd_sys2x.clk,
|
||||||
i_RST = self.reset,
|
i_RST = self.reset,
|
||||||
o_CDIVX = self.cd_sys.clk),
|
o_CDIVX = self.cd_sys.clk),
|
||||||
AsyncResetSynchronizer(self.cd_sys, ~pll.locked | self.reset | self.rst),
|
AsyncResetSynchronizer(self.cd_sys, ~pll.locked | self.reset),
|
||||||
AsyncResetSynchronizer(self.cd_sys2x, ~pll.locked | self.reset | self.rst),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
# BaseSoC ------------------------------------------------------------------------------------------
|
# BaseSoC ------------------------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ class _CRG(Module):
|
||||||
self.clock_domains.cd_init = ClockDomain()
|
self.clock_domains.cd_init = ClockDomain()
|
||||||
self.clock_domains.cd_por = ClockDomain(reset_less=True)
|
self.clock_domains.cd_por = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_sys = ClockDomain()
|
self.clock_domains.cd_sys = ClockDomain()
|
||||||
self.clock_domains.cd_sys2x = ClockDomain()
|
self.clock_domains.cd_sys2x = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True)
|
self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True)
|
||||||
|
|
||||||
# # #
|
# # #
|
||||||
|
|
@ -68,7 +68,6 @@ class _CRG(Module):
|
||||||
i_RST = self.reset,
|
i_RST = self.reset,
|
||||||
o_CDIVX = self.cd_sys.clk),
|
o_CDIVX = self.cd_sys.clk),
|
||||||
AsyncResetSynchronizer(self.cd_sys, ~pll.locked | self.reset),
|
AsyncResetSynchronizer(self.cd_sys, ~pll.locked | self.reset),
|
||||||
AsyncResetSynchronizer(self.cd_sys2x, ~pll.locked | self.reset),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
# HDMI
|
# HDMI
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ class _CRG(Module):
|
||||||
self.clock_domains.cd_init = ClockDomain()
|
self.clock_domains.cd_init = ClockDomain()
|
||||||
self.clock_domains.cd_por = ClockDomain(reset_less=True)
|
self.clock_domains.cd_por = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_sys = ClockDomain()
|
self.clock_domains.cd_sys = ClockDomain()
|
||||||
self.clock_domains.cd_sys2x = ClockDomain()
|
self.clock_domains.cd_sys2x = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True)
|
self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True)
|
||||||
|
|
||||||
# # #
|
# # #
|
||||||
|
|
@ -69,7 +69,6 @@ class _CRG(Module):
|
||||||
i_RST = self.reset,
|
i_RST = self.reset,
|
||||||
o_CDIVX = self.cd_sys.clk),
|
o_CDIVX = self.cd_sys.clk),
|
||||||
AsyncResetSynchronizer(self.cd_sys, ~pll.locked | self.reset),
|
AsyncResetSynchronizer(self.cd_sys, ~pll.locked | self.reset),
|
||||||
AsyncResetSynchronizer(self.cd_sys2x, ~pll.locked | self.reset),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
# BaseSoC ------------------------------------------------------------------------------------------
|
# BaseSoC ------------------------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ class _CRG(Module):
|
||||||
self.clock_domains.cd_init = ClockDomain()
|
self.clock_domains.cd_init = ClockDomain()
|
||||||
self.clock_domains.cd_por = ClockDomain(reset_less=True)
|
self.clock_domains.cd_por = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_sys = ClockDomain()
|
self.clock_domains.cd_sys = ClockDomain()
|
||||||
self.clock_domains.cd_sys2x = ClockDomain()
|
self.clock_domains.cd_sys2x = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True)
|
self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True)
|
||||||
|
|
||||||
# # #
|
# # #
|
||||||
|
|
@ -74,7 +74,6 @@ class _CRG(Module):
|
||||||
i_RST = self.reset,
|
i_RST = self.reset,
|
||||||
o_CDIVX = self.cd_sys.clk),
|
o_CDIVX = self.cd_sys.clk),
|
||||||
AsyncResetSynchronizer(self.cd_sys, ~pll.locked | self.reset),
|
AsyncResetSynchronizer(self.cd_sys, ~pll.locked | self.reset),
|
||||||
AsyncResetSynchronizer(self.cd_sys2x, ~pll.locked | self.reset),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
# USB PLL
|
# USB PLL
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ class _CRG(Module):
|
||||||
self.clock_domains.cd_init = ClockDomain()
|
self.clock_domains.cd_init = ClockDomain()
|
||||||
self.clock_domains.cd_por = ClockDomain(reset_less=True)
|
self.clock_domains.cd_por = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_sys = ClockDomain()
|
self.clock_domains.cd_sys = ClockDomain()
|
||||||
self.clock_domains.cd_sys2x = ClockDomain()
|
self.clock_domains.cd_sys2x = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True)
|
self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_sys2x_eb = ClockDomain(reset_less=True)
|
self.clock_domains.cd_sys2x_eb = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_dvo = ClockDomain(reset_less=True)
|
self.clock_domains.cd_dvo = ClockDomain(reset_less=True)
|
||||||
|
|
@ -84,7 +84,6 @@ class _CRG(Module):
|
||||||
i_RST = self.reset,
|
i_RST = self.reset,
|
||||||
o_CDIVX = self.cd_sys.clk),
|
o_CDIVX = self.cd_sys.clk),
|
||||||
AsyncResetSynchronizer(self.cd_sys, ~pll.locked | self.reset),
|
AsyncResetSynchronizer(self.cd_sys, ~pll.locked | self.reset),
|
||||||
AsyncResetSynchronizer(self.cd_sys2x, ~pll.locked | self.reset),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
# Generate DVO clock
|
# Generate DVO clock
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@ class _CRGSDRAM(Module):
|
||||||
self.clock_domains.cd_init = ClockDomain()
|
self.clock_domains.cd_init = ClockDomain()
|
||||||
self.clock_domains.cd_por = ClockDomain(reset_less=True)
|
self.clock_domains.cd_por = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_sys = ClockDomain()
|
self.clock_domains.cd_sys = ClockDomain()
|
||||||
self.clock_domains.cd_sys2x = ClockDomain()
|
self.clock_domains.cd_sys2x = ClockDomain(reset_less=True)
|
||||||
self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True)
|
self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True)
|
||||||
|
|
||||||
# # #
|
# # #
|
||||||
|
|
@ -103,7 +103,6 @@ class _CRGSDRAM(Module):
|
||||||
i_RST = self.reset,
|
i_RST = self.reset,
|
||||||
o_CDIVX = self.cd_sys.clk),
|
o_CDIVX = self.cd_sys.clk),
|
||||||
AsyncResetSynchronizer(self.cd_sys, ~pll.locked | self.reset),
|
AsyncResetSynchronizer(self.cd_sys, ~pll.locked | self.reset),
|
||||||
AsyncResetSynchronizer(self.cd_sys2x, ~pll.locked | self.reset),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
self.comb += platform.request("dram_vtt_en").eq(1)
|
self.comb += platform.request("dram_vtt_en").eq(1)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue