occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

kasli: use 100MHz RTIO and 800MHz Urukul frequencies on Berkeley target 

Urukul sync is not reliable at 125/1000
This commit is contained in:
Sebastien Bourdeauducq 2019-02-05 11:24:45 +08:00
parent d0b6f92b11
commit b56c7cec1e
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
artiq/examples/kasli_basic/device_db_berkeley.py
View File

@ -5,7 +5,7 @@ device_db = {
"type": "local", "type": "local",
"module": "artiq.coredevice.core", "module": "artiq.coredevice.core",
"class": "Core", "class": "Core",
"arguments": {"host": core_addr, "ref_period": 1e-9} "arguments": {"host": core_addr, "ref_period": 1.25e-9}
}, },
"core_log": { "core_log": {
"type": "controller", "type": "controller",
@ -49,9 +49,9 @@ device_db.update({
}) })
sync_delay_seeds = [ sync_delay_seeds = [
[17, 17, 16, 16], [15, 15, 15, 16],
[16, 15, 17, 20], [14, 15, 16, 16],
[18, 19, 20, 20], [18, 18, 20, 19],
] ]
io_update_delays = [ io_update_delays = [
@ -112,7 +112,7 @@ for j in range(3):
"spi_device": "spi_urukul{}".format(j), "spi_device": "spi_urukul{}".format(j),
"sync_device": "ttl_urukul{}_sync".format(j), "sync_device": "ttl_urukul{}_sync".format(j),
"io_update_device": "ttl_urukul{}_io_update".format(j), "io_update_device": "ttl_urukul{}_io_update".format(j),
"refclk": 125e6, "refclk": 100e6,
"clk_sel": 2 "clk_sel": 2
} }
} }
@ -125,6 +125,7 @@ for j in range(3):
"class": "AD9910", "class": "AD9910",
"arguments": { "arguments": {
"pll_n": 32, "pll_n": 32,
"pll_vco": 4,
"chip_select": 4 + i, "chip_select": 4 + i,
"cpld_device": "urukul{}_cpld".format(j), "cpld_device": "urukul{}_cpld".format(j),
"sw_device": "ttl_urukul{}_sw{}".format(j, i), "sw_device": "ttl_urukul{}_sw{}".format(j, i),
@ -179,7 +180,7 @@ device_db.update(
"arguments": { "arguments": {
"spi_device": "spi_urukul3", "spi_device": "spi_urukul3",
"io_update_device": "ttl_urukul3_io_update", "io_update_device": "ttl_urukul3_io_update",
"refclk": 125e6, "refclk": 100e6,
"clk_sel": 0 "clk_sel": 0
} }
} }

4
artiq/firmware/runtime/main.rs
View File

@ -176,8 +176,8 @@ fn setup_si5324_as_synthesizer()
bwsel : 3, bwsel : 3,
crystal_ref: true crystal_ref: true
}; };
// 100MHz output, from crystal (reference for HMC830) // 100MHz output, from crystal. Also used as reference for Sayma HMC830.
#[cfg(si5324_sayma_ref)] #[cfg(any(si5324_sayma_ref, all(rtio_frequency = "100.0", not(si5324_ext_ref))))]
const SI5324_SETTINGS: board_artiq::si5324::FrequencySettings const SI5324_SETTINGS: board_artiq::si5324::FrequencySettings
= board_artiq::si5324::FrequencySettings { = board_artiq::si5324::FrequencySettings {
n1_hs : 9, n1_hs : 9,

2
artiq/gateware/targets/kasli.py
View File

@ -541,7 +541,7 @@ class Berkeley(_StandaloneBase):
self.config["SI5324_AS_SYNTHESIZER"] = None self.config["SI5324_AS_SYNTHESIZER"] = None
# self.config["SI5324_EXT_REF"] = None # self.config["SI5324_EXT_REF"] = None
self.config["RTIO_FREQUENCY"] = "125.0" self.config["RTIO_FREQUENCY"] = "100.0"
if hw_rev == "v1.0": if hw_rev == "v1.0":
# EEM clock fan-out from Si5324, not MMCX # EEM clock fan-out from Si5324, not MMCX
self.comb += self.platform.request("clk_sel").eq(1) self.comb += self.platform.request("clk_sel").eq(1)