M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

kasli: use SFP2 for DRTIO mastering 

SFP1 PCB routing has some issues.

Also use SFP1 LED for DRTIO in both master and satellite.
This commit is contained in:
Sebastien Bourdeauducq 2018-01-26 19:02:54 +08:00
parent c9b36e3559
commit 440e19b8f9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,10 +216,10 @@ class Master(MiniSoC, AMPSoC):
self.config["SI5324_SOFT_RESET"] = None self.config["SI5324_SOFT_RESET"] = None
self.config["SI5324_FREE_RUNNING"] = None self.config["SI5324_FREE_RUNNING"] = None
self.comb += platform.request("sfp_ctl", 1).tx_disable.eq(0) self.comb += platform.request("sfp_ctl", 2).tx_disable.eq(0)
self.submodules.transceiver = gtp_7series.GTP( self.submodules.transceiver = gtp_7series.GTP(
qpll_channel=self.drtio_qpll_channel, qpll_channel=self.drtio_qpll_channel,
data_pads=[platform.request("sfp", 1)], data_pads=[platform.request("sfp", 2)],
sys_clk_freq=self.clk_freq, sys_clk_freq=self.clk_freq,
rtio_clk_freq=rtio_clk_freq) rtio_clk_freq=rtio_clk_freq)
@ -245,7 +245,7 @@ class Master(MiniSoC, AMPSoC):
phy = ttl_simple.Output(platform.request("user_led", 0)) phy = ttl_simple.Output(platform.request("user_led", 0))
self.submodules += phy self.submodules += phy
rtio_channels.append(rtio.Channel.from_phy(phy)) rtio_channels.append(rtio.Channel.from_phy(phy))
phy = ttl_simple.Output(platform.request("sfp_ctl", 2).led) phy = ttl_simple.Output(platform.request("sfp_ctl", 1).led)
self.submodules += phy self.submodules += phy
rtio_channels.append(rtio.Channel.from_phy(phy)) rtio_channels.append(rtio.Channel.from_phy(phy))
@ -315,7 +315,7 @@ class Satellite(BaseSoC):
phy = ttl_simple.Output(platform.request("user_led", 0)) phy = ttl_simple.Output(platform.request("user_led", 0))
self.submodules += phy self.submodules += phy
rtio_channels.append(rtio.Channel.from_phy(phy)) rtio_channels.append(rtio.Channel.from_phy(phy))
phy = ttl_simple.Output(platform.request("sfp_ctl", 2).led) phy = ttl_simple.Output(platform.request("sfp_ctl", 1).led)
self.submodules += phy self.submodules += phy
rtio_channels.append(rtio.Channel.from_phy(phy)) rtio_channels.append(rtio.Channel.from_phy(phy))