From f2ec8692c059f8581943c47fddaeeb8362445824 Mon Sep 17 00:00:00 2001
From: Robert Jordens <rj@m-labs.hk>
Date: Tue, 1 Mar 2016 01:52:46 +0100
Subject: [PATCH] nist_clock: disable spi1/2

---
 artiq/gateware/targets/kc705.py |  2 +-
 examples/master/device_db.pyon  | 14 +-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/artiq/gateware/targets/kc705.py b/artiq/gateware/targets/kc705.py
index 5213adaae..5872e0f5f 100755
--- a/artiq/gateware/targets/kc705.py
+++ b/artiq/gateware/targets/kc705.py
@@ -262,7 +262,7 @@ class NIST_CLOCK(_NIST_Ions):
         rtio_channels.append(rtio.Channel.from_phy(
             phy, ofifo_depth=4, ififo_depth=4))
 
-        for i in range(3):
+        for i in range(1):  # spi1 and spi2 collide in pinout with ttl
             phy = spi.SPIMaster(self.platform.request("spi", i))
             self.submodules += phy
             rtio_channels.append(rtio.Channel.from_phy(
diff --git a/examples/master/device_db.pyon b/examples/master/device_db.pyon
index a78c74eba..5debbc7d3 100644
--- a/examples/master/device_db.pyon
+++ b/examples/master/device_db.pyon
@@ -100,24 +100,12 @@
         "class": "SPIMaster",
         "arguments": {"channel": 22}
     },
-    "spi1": {
-        "type": "local",
-        "module": "artiq.coredevice.spi",
-        "class": "SPIMaster",
-        "arguments": {"channel": 23}
-    },
-    "spi2": {
-        "type": "local",
-        "module": "artiq.coredevice.spi",
-        "class": "SPIMaster",
-        "arguments": {"channel": 24}
-    },
 
     "ttl_clock_la32_p": {
         "type": "local",
         "module": "artiq.coredevice.ttl",
         "class": "TTLClockGen",
-        "arguments": {"channel": 25}
+        "arguments": {"channel": 23}
     },
 
     "dds_bus": {