From e17e458c583e0ec1fdf8807d11614f88416bf3de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20J=C3=B6rdens?= <rj@quartiq.de>
Date: Tue, 6 Nov 2018 10:06:22 +0000
Subject: [PATCH] ptb2: add sync to urukul0 for ad9910 usage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Robert Jördens <rj@quartiq.de>
---
 artiq/examples/kasli_basic/device_db_ptb2.py | 36 ++++++++++++--------
 artiq/gateware/targets/kasli.py              |  3 +-
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/artiq/examples/kasli_basic/device_db_ptb2.py b/artiq/examples/kasli_basic/device_db_ptb2.py
index ed6d4722f..78b4d28e1 100644
--- a/artiq/examples/kasli_basic/device_db_ptb2.py
+++ b/artiq/examples/kasli_basic/device_db_ptb2.py
@@ -87,36 +87,42 @@ device_db.update({
         "class": "SPIMaster",
         "arguments": {"channel": 27}
     },
-    "ttl_urukul0_io_update": {
+    "ttl_urukul0_sync": {
         "type": "local",
         "module": "artiq.coredevice.ttl",
-        "class": "TTLOut",
-        "arguments": {"channel": 28}
+        "class": "TTLClockGen",
+        "arguments": {"channel": 28, "acc_width": 4}
     },
-    "ttl_urukul0_sw0": {
+    "ttl_urukul0_io_update": {
         "type": "local",
         "module": "artiq.coredevice.ttl",
         "class": "TTLOut",
         "arguments": {"channel": 29}
     },
-    "ttl_urukul0_sw1": {
+    "ttl_urukul0_sw0": {
         "type": "local",
         "module": "artiq.coredevice.ttl",
         "class": "TTLOut",
         "arguments": {"channel": 30}
     },
-    "ttl_urukul0_sw2": {
+    "ttl_urukul0_sw1": {
         "type": "local",
         "module": "artiq.coredevice.ttl",
         "class": "TTLOut",
         "arguments": {"channel": 31}
     },
-    "ttl_urukul0_sw3": {
+    "ttl_urukul0_sw2": {
         "type": "local",
         "module": "artiq.coredevice.ttl",
         "class": "TTLOut",
         "arguments": {"channel": 32}
     },
+    "ttl_urukul0_sw3": {
+        "type": "local",
+        "module": "artiq.coredevice.ttl",
+        "class": "TTLOut",
+        "arguments": {"channel": 33}
+    },
     "urukul0_cpld": {
         "type": "local",
         "module": "artiq.coredevice.urukul",
@@ -150,19 +156,19 @@ device_db.update({
         "type": "local",
         "module": "artiq.coredevice.spi2",
         "class": "SPIMaster",
-        "arguments": {"channel": 33}
+        "arguments": {"channel": 34}
     },
     "ttl_urukul1_sync": {
         "type": "local",
         "module": "artiq.coredevice.ttl",
         "class": "TTLClockGen",
-        "arguments": {"channel": 34, "acc_width": 4}
+        "arguments": {"channel": 35, "acc_width": 4}
     },
     "ttl_urukul1_io_update": {
         "type": "local",
         "module": "artiq.coredevice.ttl",
         "class": "TTLOut",
-        "arguments": {"channel": 35}
+        "arguments": {"channel": 36}
     },
     "urukul1_cpld": {
         "type": "local",
@@ -197,13 +203,13 @@ device_db.update({
         "type": "local",
         "module": "artiq.coredevice.ttl",
         "class": "TTLOut",
-        "arguments": {"channel": 36}
+        "arguments": {"channel": 37}
     },
     "led1": {
         "type": "local",
         "module": "artiq.coredevice.ttl",
         "class": "TTLOut",
-        "arguments": {"channel": 37}
+        "arguments": {"channel": 38}
     }
 })
 
@@ -213,19 +219,19 @@ device_db.update({
         "type": "local",
         "module": "artiq.coredevice.spi2",
         "class": "SPIMaster",
-        "arguments": {"channel": 38}
+        "arguments": {"channel": 39}
     },
     "ttl_zotino0_ldac": {
         "type": "local",
         "module": "artiq.coredevice.ttl",
         "class": "TTLOut",
-        "arguments": {"channel": 39}
+        "arguments": {"channel": 40}
     },
     "ttl_zotino0_clr": {
         "type": "local",
         "module": "artiq.coredevice.ttl",
         "class": "TTLOut",
-        "arguments": {"channel": 40}
+        "arguments": {"channel": 41}
     },
     "zotino0": {
         "type": "local",
diff --git a/artiq/gateware/targets/kasli.py b/artiq/gateware/targets/kasli.py
index 0475fd9a6..bf1586a92 100755
--- a/artiq/gateware/targets/kasli.py
+++ b/artiq/gateware/targets/kasli.py
@@ -597,7 +597,8 @@ class PTB2(_StandaloneBase):
         eem.DIO.add_std(self, 2,
             ttl_serdes_7series.Output_8X, ttl_serdes_7series.Output_8X)
         eem.Sampler.add_std(self, 3, None, ttl_serdes_7series.Output_8X)
-        eem.Urukul.add_std(self, 5, 4, ttl_serdes_7series.Output_8X)
+        eem.Urukul.add_std(self, 5, 4, ttl_serdes_7series.Output_8X,
+                           ttl_simple.ClockGen)
         eem.Urukul.add_std(self, 6, None, ttl_serdes_7series.Output_8X,
                            ttl_simple.ClockGen)