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

cores/clock/xilinx: Cosmetic cleanup on Instances.

This commit is contained in:
Florent Kermarrec 2021-05-19 22:20:04 +02:00
parent 12b27f961c
commit cbb75b852e
4 changed files with 77 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
litex/soc/cores/clock/xilinx_s6.py
View File

@ -32,9 +32,14 @@ class S6PLL(XilinxClocking):
config = self.compute_config() config = self.compute_config()
pll_fb = Signal() pll_fb = Signal()
self.params.update( self.params.update(
# Global.
p_SIM_DEVICE = "SPARTAN6", p_SIM_DEVICE = "SPARTAN6",
p_BANDWIDTH = "OPTIMIZED", p_BANDWIDTH = "OPTIMIZED",
p_COMPENSATION = "INTERNAL", p_COMPENSATION = "INTERNAL",
i_RST = self.reset,
o_LOCKED = self.locked,
# VCO.
p_REF_JITTER = .01, p_CLK_FEEDBACK="CLKFBOUT", p_REF_JITTER = .01, p_CLK_FEEDBACK="CLKFBOUT",
p_CLKIN1_PERIOD = 1e9/self.clkin_freq, p_CLKIN1_PERIOD = 1e9/self.clkin_freq,
p_CLKIN2_PERIOD = 0., p_CLKIN2_PERIOD = 0.,
@ -42,11 +47,9 @@ class S6PLL(XilinxClocking):
p_CLKFBOUT_PHASE = 0., p_CLKFBOUT_PHASE = 0.,
p_DIVCLK_DIVIDE = config["divclk_divide"], p_DIVCLK_DIVIDE = config["divclk_divide"],
i_CLKINSEL = 1, i_CLKINSEL = 1,
i_RST = self.reset,
i_CLKIN1 = self.clkin, i_CLKIN1 = self.clkin,
i_CLKFBIN = pll_fb, i_CLKFBIN = pll_fb,
o_CLKFBOUT = pll_fb, o_CLKFBOUT = pll_fb,
o_LOCKED = self.locked,
) )
for n, (clk, f, p, m) in sorted(self.clkouts.items()): for n, (clk, f, p, m) in sorted(self.clkouts.items()):
self.params["p_CLKOUT{}_DIVIDE".format(n)] = config["clkout{}_divide".format(n)] self.params["p_CLKOUT{}_DIVIDE".format(n)] = config["clkout{}_divide".format(n)]

34
litex/soc/cores/clock/xilinx_s7.py
View File

@ -31,12 +31,19 @@ class S7PLL(XilinxClocking):
config = self.compute_config() config = self.compute_config()
pll_fb = Signal() pll_fb = Signal()
self.params.update( self.params.update(
p_STARTUP_WAIT="FALSE", o_LOCKED=self.locked, i_RST=self.reset, # Global.
p_STARTUP_WAIT = "FALSE",
i_RST = self.reset,
o_LOCKED = self.locked,
# VCO # VCO.
p_REF_JITTER1=0.01, p_CLKIN1_PERIOD=1e9/self.clkin_freq, p_REF_JITTER1 = 0.01,
p_CLKFBOUT_MULT=config["clkfbout_mult"], p_DIVCLK_DIVIDE=config["divclk_divide"], p_CLKIN1_PERIOD = 1e9/self.clkin_freq,
i_CLKIN1=self.clkin, i_CLKFBIN=pll_fb, o_CLKFBOUT=pll_fb, p_CLKFBOUT_MULT = config["clkfbout_mult"],
p_DIVCLK_DIVIDE = config["divclk_divide"],
i_CLKIN1 = self.clkin,
i_CLKFBIN = pll_fb,
o_CLKFBOUT = pll_fb,
) )
for n, (clk, f, p, m) in sorted(self.clkouts.items()): for n, (clk, f, p, m) in sorted(self.clkouts.items()):
self.params["p_CLKOUT{}_DIVIDE".format(n)] = config["clkout{}_divide".format(n)] self.params["p_CLKOUT{}_DIVIDE".format(n)] = config["clkout{}_divide".format(n)]
@ -71,12 +78,19 @@ class S7MMCM(XilinxClocking):
config = self.compute_config() config = self.compute_config()
mmcm_fb = Signal() mmcm_fb = Signal()
self.params.update( self.params.update(
p_BANDWIDTH="OPTIMIZED", o_LOCKED=self.locked, i_RST=self.reset, # Global.
p_BANDWIDTH = "OPTIMIZED",
i_RST = self.reset,
o_LOCKED = self.locked,
# VCO # VCO.
p_REF_JITTER1=0.01, p_CLKIN1_PERIOD=1e9/self.clkin_freq, p_REF_JITTER1 = 0.01,
p_CLKFBOUT_MULT_F=config["clkfbout_mult"], p_DIVCLK_DIVIDE=config["divclk_divide"], p_CLKIN1_PERIOD = 1e9/self.clkin_freq,
i_CLKIN1=self.clkin, i_CLKFBIN=mmcm_fb, o_CLKFBOUT=mmcm_fb, p_CLKFBOUT_MULT_F = config["clkfbout_mult"],
p_DIVCLK_DIVIDE = config["divclk_divide"],
i_CLKIN1 = self.clkin,
i_CLKFBIN = mmcm_fb,
o_CLKFBOUT = mmcm_fb,
) )
for n, (clk, f, p, m) in sorted(self.clkouts.items()): for n, (clk, f, p, m) in sorted(self.clkouts.items()):
if n == 0: if n == 0:

34
litex/soc/cores/clock/xilinx_us.py
View File

@ -36,12 +36,19 @@ class USPLL(XilinxClocking):
config = self.compute_config() config = self.compute_config()
pll_fb = Signal() pll_fb = Signal()
self.params.update( self.params.update(
p_STARTUP_WAIT="FALSE", o_LOCKED=self.locked, i_RST=self.reset, # Global.
p_STARTUP_WAIT = "FALSE",
i_RST = self.reset,
o_LOCKED = self.locked,
# VCO # VCO.
p_REF_JITTER1=0.01, p_CLKIN1_PERIOD=1e9/self.clkin_freq, p_REF_JITTER1 = 0.01,
p_CLKFBOUT_MULT=config["clkfbout_mult"], p_DIVCLK_DIVIDE=config["divclk_divide"], p_CLKIN1_PERIOD = 1e9/self.clkin_freq,
i_CLKIN1=self.clkin, i_CLKFBIN=pll_fb, o_CLKFBOUT=pll_fb, p_CLKFBOUT_MULT = config["clkfbout_mult"],
p_DIVCLK_DIVIDE = config["divclk_divide"],
i_CLKIN1 = self.clkin,
i_CLKFBIN = pll_fb,
o_CLKFBOUT = pll_fb,
) )
for n, (clk, f, p, m) in sorted(self.clkouts.items()): for n, (clk, f, p, m) in sorted(self.clkouts.items()):
self.params["p_CLKOUT{}_DIVIDE".format(n)] = config["clkout{}_divide".format(n)] self.params["p_CLKOUT{}_DIVIDE".format(n)] = config["clkout{}_divide".format(n)]
@ -74,12 +81,19 @@ class USMMCM(XilinxClocking):
config = self.compute_config() config = self.compute_config()
mmcm_fb = Signal() mmcm_fb = Signal()
self.params.update( self.params.update(
p_BANDWIDTH="OPTIMIZED", o_LOCKED=self.locked, i_RST=self.reset, # Global.
p_BANDWIDTH = "OPTIMIZED",
i_RST = self.reset,
o_LOCKED = self.locked,
# VCO # VCO.
p_REF_JITTER1=0.01, p_CLKIN1_PERIOD=1e9/self.clkin_freq, p_REF_JITTER1 = 0.01,
p_CLKFBOUT_MULT_F=config["clkfbout_mult"], p_DIVCLK_DIVIDE=config["divclk_divide"], p_CLKIN1_PERIOD = 1e9/self.clkin_freq,
i_CLKIN1=self.clkin, i_CLKFBIN=mmcm_fb, o_CLKFBOUT=mmcm_fb, p_CLKFBOUT_MULT_F = config["clkfbout_mult"],
p_DIVCLK_DIVIDE = config["divclk_divide"],
i_CLKIN1 = self.clkin,
i_CLKFBIN = mmcm_fb,
o_CLKFBOUT = mmcm_fb,
) )
for n, (clk, f, p, m) in sorted(self.clkouts.items()): for n, (clk, f, p, m) in sorted(self.clkouts.items()):
if n == 0: if n == 0:

34
litex/soc/cores/clock/xilinx_usp.py
View File

@ -36,12 +36,19 @@ class USPPLL(XilinxClocking):
config = self.compute_config() config = self.compute_config()
pll_fb = Signal() pll_fb = Signal()
self.params.update( self.params.update(
p_STARTUP_WAIT="FALSE", o_LOCKED=self.locked, i_RST=self.reset, # Global.
p_STARTUP_WAIT = "FALSE",
i_RST = self.reset,
o_LOCKED = self.locked,
# VCO # VCO.
p_REF_JITTER1=0.01, p_CLKIN1_PERIOD=1e9/self.clkin_freq, p_REF_JITTER1 = 0.01,
p_CLKFBOUT_MULT=config["clkfbout_mult"], p_DIVCLK_DIVIDE=config["divclk_divide"], p_CLKIN1_PERIOD = 1e9/self.clkin_freq,
i_CLKIN1=self.clkin, i_CLKFBIN=pll_fb, o_CLKFBOUT=pll_fb, p_CLKFBOUT_MULT = config["clkfbout_mult"],
p_DIVCLK_DIVIDE = config["divclk_divide"],
i_CLKIN1 = self.clkin,
i_CLKFBIN = pll_fb,
o_CLKFBOUT = pll_fb,
) )
for n, (clk, f, p, m) in sorted(self.clkouts.items()): for n, (clk, f, p, m) in sorted(self.clkouts.items()):
self.params["p_CLKOUT{}_DIVIDE".format(n)] = config["clkout{}_divide".format(n)] self.params["p_CLKOUT{}_DIVIDE".format(n)] = config["clkout{}_divide".format(n)]
@ -74,12 +81,19 @@ class USPMMCM(XilinxClocking):
config = self.compute_config() config = self.compute_config()
mmcm_fb = Signal() mmcm_fb = Signal()
self.params.update( self.params.update(
p_BANDWIDTH="OPTIMIZED", o_LOCKED=self.locked, i_RST=self.reset, # Global.
p_BANDWIDTH = "OPTIMIZED",
i_RST = self.reset,
o_LOCKED = self.locked,
# VCO # VCO.
p_REF_JITTER1=0.01, p_CLKIN1_PERIOD=1e9/self.clkin_freq, p_REF_JITTER1 = 0.01,
p_CLKFBOUT_MULT_F=config["clkfbout_mult"], p_DIVCLK_DIVIDE=config["divclk_divide"], p_CLKIN1_PERIOD = 1e9/self.clkin_freq,
i_CLKIN1=self.clkin, i_CLKFBIN=mmcm_fb, o_CLKFBOUT=mmcm_fb, p_CLKFBOUT_MULT_F = config["clkfbout_mult"],
p_DIVCLK_DIVIDE = config["divclk_divide"],
i_CLKIN1 = self.clkin,
i_CLKFBIN = mmcm_fb,
o_CLKFBOUT = mmcm_fb,
) )
for n, (clk, f, p, m) in sorted(self.clkouts.items()): for n, (clk, f, p, m) in sorted(self.clkouts.items()):
if n == 0: if n == 0: