From f8c6fd4b79d4e53813aeb39aaef0273bb2d55395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Mon, 4 Oct 2021 17:03:56 +0200 Subject: [PATCH] ptb3 satellite/master changes --- ptb3master.json | 23 ++++++++++--------- ptb3satellite.json | 55 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 62 insertions(+), 16 deletions(-) diff --git a/ptb3master.json b/ptb3master.json index e1c5c27..92a03a4 100644 --- a/ptb3master.json +++ b/ptb3master.json @@ -1,11 +1,12 @@ { - "_description": "PTB 4.43 with backplane adapter and 4 Urukuls", + "_description": "PTB 4.43 Master with backplane adapter", "target": "kasli", "variant": "ptb3master", "hw_rev": "v1.1", "base": "master", "ext_ref_frequency": 100e6, "core_addr": "10.34.16.100", + "vendor": "QUARTIQ", "peripherals": [ { "type": "dio", @@ -45,14 +46,11 @@ }, { "type": "urukul", - "ports": [6], + "ports": [7, 6], + "dds": "ad9912", "clk_sel": 1, "refclk": 100e6, - "pll_n": 40 - }, - { - "type": "zotino", - "ports": [7] + "pll_n": 10 }, { "type": "urukul", @@ -63,11 +61,12 @@ "pll_n": 10 }, { - "type": "urukul", - "ports": [11, 10], - "clk_sel": 1, - "refclk": 100e6, - "pll_n": 40 + "type": "zotino", + "ports": [10] + }, + { + "type": "zotino", + "ports": [11] } ] } diff --git a/ptb3satellite.json b/ptb3satellite.json index 5293100..7ae014b 100644 --- a/ptb3satellite.json +++ b/ptb3satellite.json @@ -1,5 +1,5 @@ { - "_description": "PTB 4.43 satellite", + "_description": "PTB 4.43 Satellite", "target": "kasli", "min_artiq_version": "6.0", "variant": "ptb3satellite", @@ -29,11 +29,58 @@ "bank_direction_high": "output" }, { - "type": "zotino", - "hw_rev": "v1.3", + "type": "dio", + "board": "DIO_SMA", + "hw_rev": "v1.1", "ports": [ 2 - ] + ], + "bank_direction_low": "output", + "bank_direction_high": "output" + }, + { + "type": "urukul", + "ports": [4, 3], + "dds": "ad9912", + "clk_sel": 1, + "refclk": 100e6, + "pll_n": 10 + }, + { + "type": "urukul", + "ports": [6, 5], + "dds": "ad9912", + "clk_sel": 1, + "refclk": 100e6, + "pll_n": 10 + }, + { + "type": "urukul", + "ports": [8, 7], + "clk_sel": 1, + "refclk": 100e6, + "pll_n": 40 + }, + { + "type": "urukul", + "ports": [9], + "clk_sel": 1, + "refclk": 100e6, + "pll_n": 40 + }, + { + "type": "urukul", + "ports": [10], + "clk_sel": 1, + "refclk": 100e6, + "pll_n": 40 + }, + { + "type": "urukul", + "ports": [11], + "clk_sel": 1, + "refclk": 100e6, + "pll_n": 40 } ] }