From c4fa44bc62bfe246f5a2270cf9840f547713d9b0 Mon Sep 17 00:00:00 2001 From: Thomas Harty Date: Sun, 18 Mar 2018 00:25:43 +0000 Subject: [PATCH 1/2] Add Zotino and Sampler functions to Kasli. Add Zotino to Kasli EEM 7 on OptiClock. --- artiq/gateware/targets/kasli.py | 98 +++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 6 deletions(-) diff --git a/artiq/gateware/targets/kasli.py b/artiq/gateware/targets/kasli.py index 824699780..34f0d2992 100755 --- a/artiq/gateware/targets/kasli.py +++ b/artiq/gateware/targets/kasli.py @@ -161,6 +161,44 @@ def _dio(eem): for i in range(8)] +def _sampler(eem): + return [ + ("{}_adc_spi_p".format(eem), 0, + Subsignal("clk", Pins("{}:{}_p".format(eem, _eem_signal(0)))), + Subsignal("miso", Pins("{}:{}_p".format(eem, _eem_signal(1)))), + IOStandard("LVDS_25"), + ), + ("{}_adc_spi_n".format(eem), 0, + Subsignal("clk", Pins("{}:{}_n".format(eem, _eem_signal(0)))), + Subsignal("miso", Pins("{}:{}_n".format(eem, _eem_signal(1)))), + IOStandard("LVDS_25"), + ), + ("{}_pgia_spi_p".format(eem), 0, + Subsignal("clk", Pins("{}:{}_p".format(eem, _eem_signal(4)))), + Subsignal("mosi", Pins("{}:{}_p".format(eem, _eem_signal(5)))), + Subsignal("miso", Pins("{}:{}_p".format(eem, _eem_signal(6)))), + Subsignal("cs_n", Pins("{}:{}_p".format(eem, _eem_signal(7)))), + IOStandard("LVDS_25"), + ), + ("{}_pgia_spi_n".format(eem), 0, + Subsignal("clk", Pins("{}:{}_n".format(eem, _eem_signal(4)))), + Subsignal("mosi", Pins("{}:{}_n".format(eem, _eem_signal(5)))), + Subsignal("miso", Pins("{}:{}_n".format(eem, _eem_signal(6)))), + Subsignal("cs_n", Pins("{}:{}_n".format(eem, _eem_signal(7)))), + IOStandard("LVDS_25"), + ), + ] + [ + ("{}_{}".format(eem, sig), 0, + Subsignal("p", Pins("{}:{}_p".format(j, _eem_signal(i)))), + Subsignal("n", Pins("{}:{}_n".format(j, _eem_signal(i)))), + IOStandard("LVDS_25") + ) for i, j, sig in [ + (2, eem, "cnv"), + (3, eem, "sdr") + ] + ] + + def _novogorny(eem): return [ ("{}_spi_p".format(eem), 0, @@ -182,14 +220,47 @@ def _novogorny(eem): IOStandard("LVDS_25"), ), ] + [ - ("{}_{}".format(eem, sig), 0, + ("{}_{}".format(eem, sig), 0, + Subsignal("p", Pins("{}:{}_p".format(j, _eem_signal(i)))), + Subsignal("n", Pins("{}:{}_n".format(j, _eem_signal(i)))), + IOStandard("LVDS_25") + ) for i, j, sig in [ + (5, eem, "conv"), + (6, eem, "busy"), + (7, eem, "scko"), + ] + ] + + +def _zotino(eem): + return [ + ("{}_spi_p".format(eem), 0, + Subsignal("clk", Pins("{}:{}_p".format(eem, _eem_signal(0)))), + Subsignal("mosi", Pins("{}:{}_p".format(eem, _eem_signal(1)))), + Subsignal("miso", Pins("{}:{}_p".format(eem, _eem_signal(2)))), + Subsignal("cs_n", Pins( + "{0}:{1[0]}_p {0}:{1[1]}_p".format( + eem, [_eem_signal(i + 3) for i in range(2)]))), + IOStandard("LVDS_25"), + ), + ("{}_spi_n".format(eem), 0, + Subsignal("clk", Pins("{}:{}_n".format(eem, _eem_signal(0)))), + Subsignal("mosi", Pins("{}:{}_n".format(eem, _eem_signal(1)))), + Subsignal("miso", Pins("{}:{}_n".format(eem, _eem_signal(2)))), + Subsignal("cs_n", Pins( + "{0}:{1[0]}_n {0}:{1[1]}_n".format( + eem, [_eem_signal(i + 3) for i in range(2)]))), + IOStandard("LVDS_25"), + ), + ] + [ + ("{}_{}".format(eem, sig), 0, Subsignal("p", Pins("{}:{}_p".format(j, _eem_signal(i)))), Subsignal("n", Pins("{}:{}_n".format(j, _eem_signal(i)))), IOStandard("LVDS_25") - ) for i, j, sig in [ - (5, eem, "conv"), - (6, eem, "busy"), - (7, eem, "scko"), + ) for i, j, sig in [ + (5, eem, "ldac_n"), + (6, eem, "busy"), + (7, eem, "clr_n"), ] ] @@ -254,7 +325,7 @@ class Opticlock(_StandaloneBase): platform.add_extension(_novogorny("eem3")) platform.add_extension(_urukul("eem5", "eem4")) platform.add_extension(_urukul("eem6")) - # platform.add_extension(_zotino("eem7")) + platform.add_extension(_zotino("eem7")) # EEM clock fan-out from Si5324, not MMCX try: @@ -274,6 +345,7 @@ class Opticlock(_StandaloneBase): self.submodules += phy rtio_channels.append(rtio.Channel.from_phy(phy)) + # EEM3: Novogorny phy = spi2.SPIMaster(self.platform.request("eem3_spi_p"), self.platform.request("eem3_spi_n")) self.submodules += phy @@ -285,6 +357,7 @@ class Opticlock(_StandaloneBase): self.submodules += phy rtio_channels.append(rtio.Channel.from_phy(phy)) + # EEM3 + EEM5: Urukul phy = spi2.SPIMaster(self.platform.request("eem5_spi_p"), self.platform.request("eem5_spi_n")) self.submodules += phy @@ -305,6 +378,7 @@ class Opticlock(_StandaloneBase): self.submodules += phy rtio_channels.append(rtio.Channel.from_phy(phy)) + # EEM6: Urukul phy = spi2.SPIMaster(self.platform.request("eem6_spi_p"), self.platform.request("eem6_spi_n")) self.submodules += phy @@ -319,6 +393,18 @@ class Opticlock(_StandaloneBase): pads = platform.request("eem6_dds_reset") self.specials += DifferentialOutput(0, pads.p, pads.n) + # EEM7: Zotino + phy = spi2.SPIMaster(self.platform.request("eem7_spi_p"), + self.platform.request("eem7_spi_n")) + self.submodules += phy + rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=16)) + + for signal in "ldac_n clr_n".split(): + pads = platform.request("eem7_{}".format(signal)) + phy = ttl_serdes_7series.Output_8X(pads.p, pads.n) + self.submodules += phy + rtio_channels.append(rtio.Channel.from_phy(phy)) + self.config["HAS_RTIO_LOG"] = None self.config["RTIO_LOG_CHANNEL"] = len(rtio_channels) rtio_channels.append(rtio.LogChannel()) From 37d431039d7e6b0ef97e00ed3242c18897360a58 Mon Sep 17 00:00:00 2001 From: Thomas Harty Date: Mon, 19 Mar 2018 09:42:18 +0000 Subject: [PATCH 2/2] Fix typos. Reduce ififo depth to 4 for Zotino. --- artiq/gateware/targets/kasli.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/artiq/gateware/targets/kasli.py b/artiq/gateware/targets/kasli.py index 34f0d2992..7ddf54245 100755 --- a/artiq/gateware/targets/kasli.py +++ b/artiq/gateware/targets/kasli.py @@ -229,7 +229,7 @@ def _novogorny(eem): (6, eem, "busy"), (7, eem, "scko"), ] - ] + ] def _zotino(eem): @@ -357,7 +357,7 @@ class Opticlock(_StandaloneBase): self.submodules += phy rtio_channels.append(rtio.Channel.from_phy(phy)) - # EEM3 + EEM5: Urukul + # EEM5 + EEM4: Urukul phy = spi2.SPIMaster(self.platform.request("eem5_spi_p"), self.platform.request("eem5_spi_n")) self.submodules += phy @@ -397,7 +397,7 @@ class Opticlock(_StandaloneBase): phy = spi2.SPIMaster(self.platform.request("eem7_spi_p"), self.platform.request("eem7_spi_n")) self.submodules += phy - rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=16)) + rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=4)) for signal in "ldac_n clr_n".split(): pads = platform.request("eem7_{}".format(signal))