From 020bef4197d2eb785573fb69a01a88a4621a492f Mon Sep 17 00:00:00 2001 From: Gabriel Somlo Date: Wed, 4 Mar 2020 13:38:02 -0500 Subject: [PATCH] targets/nexys4ddr: fix sdcard clocker initialization --- litex/boards/targets/nexys4ddr.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/litex/boards/targets/nexys4ddr.py b/litex/boards/targets/nexys4ddr.py index 4a222bb6c..7c1da7c12 100755 --- a/litex/boards/targets/nexys4ddr.py +++ b/litex/boards/targets/nexys4ddr.py @@ -34,12 +34,9 @@ class _CRG(Module): self.clock_domains.cd_sys2x_dqs = ClockDomain(reset_less=True) self.clock_domains.cd_clk200 = ClockDomain() self.clock_domains.cd_eth = ClockDomain() - self.clock_domains.cd_sdcard = ClockDomain(reset_less=True) # # # - self.sd_clk_freq = int(100e6) - self.submodules.pll = pll = S7MMCM(speedgrade=-1) self.comb += pll.reset.eq(~platform.request("cpu_reset")) pll.register_clkin(platform.request("clk100"), 100e6) @@ -48,7 +45,6 @@ class _CRG(Module): pll.create_clkout(self.cd_sys2x_dqs, 2*sys_clk_freq, phase=90) pll.create_clkout(self.cd_clk200, 200e6) pll.create_clkout(self.cd_eth, 50e6) - pll.create_clkout(self.cd_sdcard, self.sd_clk_freq) self.submodules.idelayctrl = S7IDELAYCTRL(self.cd_clk200) @@ -92,7 +88,7 @@ class BaseSoC(SoCCore): def add_sdcard(self): sdcard_pads = self.platform.request("sdcard") self.comb += sdcard_pads.rst.eq(0) - self.submodules.sdclk = SDClockerS7(clkin=ClockSignal("sdcard"), clkin_freq=self.crg.sd_clk_freq) + self.submodules.sdclk = SDClockerS7(sys_clk_freq=self.sys_clk_freq) self.submodules.sdphy = SDPHY(sdcard_pads, self.platform.device) self.submodules.sdcore = SDCore(self.sdphy) self.submodules.sdtimer = Timer() @@ -109,8 +105,8 @@ class BaseSoC(SoCCore): self.sdcore.source.connect(self.bist_checker.sink), self.bist_generator.source.connect(self.sdcore.sink) ] - self.platform.add_period_constraint(self.sdclk.cd_sd.clk, period_ns(self.crg.sd_clk_freq)) - self.platform.add_period_constraint(self.sdclk.cd_sd_fb.clk, period_ns(self.crg.sd_clk_freq)) + self.platform.add_period_constraint(self.sdclk.cd_sd.clk, period_ns(self.sys_clk_freq)) + self.platform.add_period_constraint(self.sdclk.cd_sd_fb.clk, period_ns(self.sys_clk_freq)) self.platform.add_false_path_constraints( self.crg.cd_sys.clk, self.sdclk.cd_sd.clk,