mirror of https://github.com/m-labs/artiq.git
kc705: add TTLs and shift register driver for FMC DIO
This commit is contained in:
parent
4deeccbead
commit
d80cf8d59d
|
@ -34,7 +34,7 @@ device_db = {
|
||||||
"class": "DDSGroupAD9914",
|
"class": "DDSGroupAD9914",
|
||||||
"arguments": {
|
"arguments": {
|
||||||
"sysclk": 3e9,
|
"sysclk": 3e9,
|
||||||
"first_dds_bus_channel": 29,
|
"first_dds_bus_channel": 32,
|
||||||
"dds_bus_count": 2,
|
"dds_bus_count": 2,
|
||||||
"dds_channel_count": 3
|
"dds_channel_count": 3
|
||||||
}
|
}
|
||||||
|
@ -131,6 +131,34 @@ device_db = {
|
||||||
"arguments": {"channel": 26}
|
"arguments": {"channel": 26}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
# FMC DIO used to connect to Zotino
|
||||||
|
"fmcdio_dirctl_clk": {
|
||||||
|
"type": "local",
|
||||||
|
"module": "artiq.coredevice.ttl",
|
||||||
|
"class": "TTLOut",
|
||||||
|
"arguments": {"channel": 27}
|
||||||
|
},
|
||||||
|
"fmcdio_dirctl_ser": {
|
||||||
|
"type": "local",
|
||||||
|
"module": "artiq.coredevice.ttl",
|
||||||
|
"class": "TTLOut",
|
||||||
|
"arguments": {"channel": 28}
|
||||||
|
},
|
||||||
|
"fmcdio_dirctl_latch": {
|
||||||
|
"type": "local",
|
||||||
|
"module": "artiq.coredevice.ttl",
|
||||||
|
"class": "TTLOut",
|
||||||
|
"arguments": {"channel": 29}
|
||||||
|
},
|
||||||
|
"fmcdio_dirctl": {
|
||||||
|
"type": "local",
|
||||||
|
"module": "artiq.coredevice.shiftreg",
|
||||||
|
"class": "ShiftReg",
|
||||||
|
"arguments": {"clk": "fmcdio_dirctl_clk",
|
||||||
|
"ser": "fmcdio_dirctl_ser",
|
||||||
|
"latch": "fmcdio_dirctl_latch"}
|
||||||
|
},
|
||||||
|
|
||||||
# DAC
|
# DAC
|
||||||
"spi_ams101": {
|
"spi_ams101": {
|
||||||
"type": "local",
|
"type": "local",
|
||||||
|
@ -148,13 +176,13 @@ device_db = {
|
||||||
"type": "local",
|
"type": "local",
|
||||||
"module": "artiq.coredevice.spi",
|
"module": "artiq.coredevice.spi",
|
||||||
"class": "SPIMaster",
|
"class": "SPIMaster",
|
||||||
"arguments": {"channel": 27}
|
"arguments": {"channel": 30}
|
||||||
},
|
},
|
||||||
"ttl_zotino_ldac": {
|
"ttl_zotino_ldac": {
|
||||||
"type": "local",
|
"type": "local",
|
||||||
"module": "artiq.coredevice.ttl",
|
"module": "artiq.coredevice.ttl",
|
||||||
"class": "TTLOut",
|
"class": "TTLOut",
|
||||||
"arguments": {"channel": 28}
|
"arguments": {"channel": 31}
|
||||||
},
|
},
|
||||||
"dac_zotino": {
|
"dac_zotino": {
|
||||||
"type": "local",
|
"type": "local",
|
||||||
|
@ -168,20 +196,20 @@ device_db = {
|
||||||
"type": "local",
|
"type": "local",
|
||||||
"module": "artiq.coredevice.dds",
|
"module": "artiq.coredevice.dds",
|
||||||
"class": "DDSChannelAD9914",
|
"class": "DDSChannelAD9914",
|
||||||
"arguments": {"bus_channel": 29, "channel": 0},
|
"arguments": {"bus_channel": 32, "channel": 0},
|
||||||
"comment": "Comments work in DDS panel as well"
|
"comment": "Comments work in DDS panel as well"
|
||||||
},
|
},
|
||||||
"dds1": {
|
"dds1": {
|
||||||
"type": "local",
|
"type": "local",
|
||||||
"module": "artiq.coredevice.dds",
|
"module": "artiq.coredevice.dds",
|
||||||
"class": "DDSChannelAD9914",
|
"class": "DDSChannelAD9914",
|
||||||
"arguments": {"bus_channel": 29, "channel": 1}
|
"arguments": {"bus_channel": 32, "channel": 1}
|
||||||
},
|
},
|
||||||
"dds2": {
|
"dds2": {
|
||||||
"type": "local",
|
"type": "local",
|
||||||
"module": "artiq.coredevice.dds",
|
"module": "artiq.coredevice.dds",
|
||||||
"class": "DDSChannelAD9914",
|
"class": "DDSChannelAD9914",
|
||||||
"arguments": {"bus_channel": 29, "channel": 2}
|
"arguments": {"bus_channel": 32, "channel": 2}
|
||||||
},
|
},
|
||||||
|
|
||||||
# Controllers
|
# Controllers
|
||||||
|
|
|
@ -108,6 +108,12 @@ _sdcard_spi_33 = [
|
||||||
]
|
]
|
||||||
|
|
||||||
_zotino = [
|
_zotino = [
|
||||||
|
("fmcdio_dirctl", 0,
|
||||||
|
Subsignal("clk", Pins("HPC:LA32_N")),
|
||||||
|
Subsignal("ser", Pins("HPC:LA33_P")),
|
||||||
|
Subsignal("latch", Pins("HPC:LA32_P")),
|
||||||
|
IOStandard("LVCMOS33")
|
||||||
|
),
|
||||||
("zotino_spi_p", 0,
|
("zotino_spi_p", 0,
|
||||||
Subsignal("clk", Pins("HPC:LA08_P")),
|
Subsignal("clk", Pins("HPC:LA08_P")),
|
||||||
Subsignal("mosi", Pins("HPC:LA09_P")),
|
Subsignal("mosi", Pins("HPC:LA09_P")),
|
||||||
|
@ -254,13 +260,19 @@ class NIST_CLOCK(_NIST_Ions):
|
||||||
rtio_channels.append(rtio.Channel.from_phy(
|
rtio_channels.append(rtio.Channel.from_phy(
|
||||||
phy, ofifo_depth=128, ififo_depth=128))
|
phy, ofifo_depth=128, ififo_depth=128))
|
||||||
|
|
||||||
phy = spi.SPIMaster(platform.request("sdcard_spi_33", 0))
|
phy = spi.SPIMaster(platform.request("sdcard_spi_33"))
|
||||||
self.submodules += phy
|
self.submodules += phy
|
||||||
rtio_channels.append(rtio.Channel.from_phy(
|
rtio_channels.append(rtio.Channel.from_phy(
|
||||||
phy, ofifo_depth=4, ififo_depth=4))
|
phy, ofifo_depth=4, ififo_depth=4))
|
||||||
|
|
||||||
sdac_phy = spi.SPIMaster(self.platform.request("zotino_spi_p", 0),
|
fmcdio_dirctl = self.platform.request("fmcdio_dirctl")
|
||||||
self.platform.request("zotino_spi_n", 0))
|
for s in fmcdio_dirctl.clk, fmcdio_dirctl.ser, fmcdio_dirctl.latch:
|
||||||
|
phy = ttl_simple.Output(s)
|
||||||
|
self.submodules += phy
|
||||||
|
rtio_channels.append(rtio.Channel.from_phy(phy))
|
||||||
|
|
||||||
|
sdac_phy = spi.SPIMaster(self.platform.request("zotino_spi_p"),
|
||||||
|
self.platform.request("zotino_spi_n"))
|
||||||
self.submodules += sdac_phy
|
self.submodules += sdac_phy
|
||||||
rtio_channels.append(rtio.Channel.from_phy(sdac_phy, ififo_depth=4))
|
rtio_channels.append(rtio.Channel.from_phy(sdac_phy, ififo_depth=4))
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,13 @@ With the CLOCK hardware, the TTL lines are mapped as follows:
|
||||||
+--------------------+-----------------------+--------------+
|
+--------------------+-----------------------+--------------+
|
||||||
| 21 | LA32_P | Clock |
|
| 21 | LA32_P | Clock |
|
||||||
+--------------------+-----------------------+--------------+
|
+--------------------+-----------------------+--------------+
|
||||||
| 28 | ZOTINO_LDAC | Output |
|
| 27 | FMCDIO_DIRCTL_CLK | Output |
|
||||||
|
+--------------------+-----------------------+--------------+
|
||||||
|
| 28 | FMCDIO_DIRCTL_SER | Output |
|
||||||
|
+--------------------+-----------------------+--------------+
|
||||||
|
| 29 | FMCDIO_DIRCTL_LATCH | Output |
|
||||||
|
+--------------------+-----------------------+--------------+
|
||||||
|
| 31 | ZOTINO_LDAC | Output |
|
||||||
+--------------------+-----------------------+--------------+
|
+--------------------+-----------------------+--------------+
|
||||||
|
|
||||||
The board has RTIO SPI buses mapped as follows:
|
The board has RTIO SPI buses mapped as follows:
|
||||||
|
@ -86,11 +92,14 @@ The board has RTIO SPI buses mapped as follows:
|
||||||
+--------------+--------------+--------------+--------------+------------+
|
+--------------+--------------+--------------+--------------+------------+
|
||||||
| 26 | MMC_SPI_CS_N | MMC_SPI_MOSI | MMC_SPI_MISO | MMC_SPI_CLK|
|
| 26 | MMC_SPI_CS_N | MMC_SPI_MOSI | MMC_SPI_MISO | MMC_SPI_CLK|
|
||||||
+--------------+--------------+--------------+--------------+------------+
|
+--------------+--------------+--------------+--------------+------------+
|
||||||
| 27 | ZOTINO_CS_N | ZOTINO_MOSI | ZOTINO_MISO | ZOTINO_CLK |
|
| 30 | ZOTINO_CS_N | ZOTINO_MOSI | ZOTINO_MISO | ZOTINO_CLK |
|
||||||
+--------------+--------------+--------------+--------------+------------+
|
+--------------+--------------+--------------+--------------+------------+
|
||||||
|
|
||||||
The DDS bus is on channel 29.
|
The DDS bus is on channel 32.
|
||||||
|
|
||||||
|
This configuration supports a Zotino connected to the KC705 FMC HPC through a FMC DIO 32ch LVDS v1.2 and a VHDCI breakout board rev 1.0.
|
||||||
|
|
||||||
|
The shift registers on the FMC card should be configured to set the directions of its LVDS buffers, using :mod:`artiq.coredevice.shiftreg`.
|
||||||
|
|
||||||
NIST QC2
|
NIST QC2
|
||||||
++++++++
|
++++++++
|
||||||
|
|
Loading…
Reference in New Issue