From accab4d8b54425b64a6f83f969e8d863a6881903 Mon Sep 17 00:00:00 2001 From: Jean THOMAS Date: Mon, 6 Jul 2020 14:58:38 +0200 Subject: [PATCH] Rename from cke to clk_en --- gram/core/multiplexer.py | 2 +- gram/dfii.py | 4 ++-- gram/phy/dfi.py | 2 +- gram/simulation/icarusecpix5platform.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gram/core/multiplexer.py b/gram/core/multiplexer.py index 90c5668..f1d2548 100644 --- a/gram/core/multiplexer.py +++ b/gram/core/multiplexer.py @@ -168,7 +168,7 @@ class _Steerer(Elaboratable): rankbits = log2_int(nranks) if hasattr(phase, "reset_n"): m.d.comb += phase.reset_n.eq(1) - m.d.comb += phase.cke.eq(Repl(Signal(reset=1), nranks)) + m.d.comb += phase.clk_en.eq(Repl(Signal(reset=1), nranks)) if hasattr(phase, "odt"): # FIXME: add dynamic drive for multi-rank (will be needed for high frequencies) m.d.comb += phase.odt.eq(Repl(Signal(reset=1), nranks)) diff --git a/gram/dfii.py b/gram/dfii.py index 53053fe..5b9664c 100644 --- a/gram/dfii.py +++ b/gram/dfii.py @@ -65,7 +65,7 @@ class DFIInjector(Elaboratable): self.slave = dfi.Interface(addressbits, bankbits, nranks, databits, nphases) self.master = dfi.Interface(addressbits, bankbits, nranks, databits, nphases) - self._control = csr_bank.csr(4, "w") # sel, cke, odt, reset_n + self._control = csr_bank.csr(4, "w") # sel, clk_en, odt, reset_n self._phases = [] for n, phase in enumerate(self._inti.phases): @@ -83,7 +83,7 @@ class DFIInjector(Elaboratable): m.d.comb += self._inti.connect(self.master) for i in range(self._nranks): - m.d.comb += [phase.cke[i].eq(self._control.w_data[1]) + m.d.comb += [phase.clk_en[i].eq(self._control.w_data[1]) for phase in self._inti.phases] m.d.comb += [phase.odt[i].eq(self._control.w_data[2]) for phase in self._inti.phases if hasattr(phase, "odt")] diff --git a/gram/phy/dfi.py b/gram/phy/dfi.py index 0f6f4ae..dd3bc37 100644 --- a/gram/phy/dfi.py +++ b/gram/phy/dfi.py @@ -16,7 +16,7 @@ def phase_description(addressbits, bankbits, nranks, databits): ("cs_n", nranks, DIR_FANOUT), ("ras_n", 1, DIR_FANOUT), ("we_n", 1, DIR_FANOUT), - ("cke", nranks, DIR_FANOUT), + ("clk_en", nranks, DIR_FANOUT), ("odt", nranks, DIR_FANOUT), ("reset_n", 1, DIR_FANOUT), ("act_n", 1, DIR_FANOUT), diff --git a/gram/simulation/icarusecpix5platform.py b/gram/simulation/icarusecpix5platform.py index 1f0c9c6..9296f45 100644 --- a/gram/simulation/icarusecpix5platform.py +++ b/gram/simulation/icarusecpix5platform.py @@ -67,7 +67,7 @@ class IcarusECPIX5Platform(LatticeECP5Platform): Resource("ddr3", 0, Subsignal("clk", Pins("H3", dir="o")), #Subsignal("clk", DiffPairs("H3", "J3", dir="o"), Attrs(IO_TYPE="SSTL135D_I")), - Subsignal("cke", Pins("P1", dir="o")), + Subsignal("clk_en", Pins("P1", dir="o")), Subsignal("we_n", Pins("R3", dir="o")), Subsignal("ras_n", Pins("T3", dir="o")), Subsignal("cas_n", Pins("P2", dir="o")), -- 2.30.2