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

clean up hmc7043 reset

This commit is contained in:
Sebastien Bourdeauducq 2018-06-05 20:41:48 +08:00
parent 988054f4bb
commit af88c4c93e
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/firmware/libboard_artiq/hmc830_7043.rs
View File

@ -229,7 +229,7 @@ pub mod hmc7043 {
info!("enabling hmc7043"); info!("enabling hmc7043");
unsafe { unsafe {
csr::crg::hmc7043_rst_write(0); csr::hmc7043_reset::out_write(0);
} }
spi_setup(); spi_setup();

10
artiq/gateware/targets/sayma_rtm.py
View File

@ -19,11 +19,8 @@ from artiq.gateware import serwb
from artiq import __version__ as artiq_version from artiq import __version__ as artiq_version
class CRG(Module, AutoCSR): class CRG(Module):
def __init__(self, platform): def __init__(self, platform):
self.hmc7043_rst = CSRStorage(reset=1)
self.clock_domains.cd_sys = ClockDomain() self.clock_domains.cd_sys = ClockDomain()
self.clock_domains.cd_sys4x = ClockDomain(reset_less=True) self.clock_domains.cd_sys4x = ClockDomain(reset_less=True)
self.clock_domains.cd_clk200 = ClockDomain() self.clock_domains.cd_clk200 = ClockDomain()
@ -113,7 +110,6 @@ class SaymaRTM(Module):
csr_devices = [] csr_devices = []
self.submodules.crg = CRG(platform) self.submodules.crg = CRG(platform)
csr_devices.append("crg")
clk_freq = 125e6 clk_freq = 125e6
@ -179,7 +175,9 @@ class SaymaRTM(Module):
platform.request("ad9154_spi", 0), platform.request("ad9154_spi", 0),
platform.request("ad9154_spi", 1))) platform.request("ad9154_spi", 1)))
csr_devices.append("converter_spi") csr_devices.append("converter_spi")
self.comb += platform.request("hmc7043_reset").eq(self.crg.hmc7043_rst.storage) self.submodules.hmc7043_reset = gpio.GPIOOut(
platform.request("hmc7043_reset"), reset_out=1)
csr_devices.append("hmc7043_reset")
# AMC/RTM serwb # AMC/RTM serwb
serwb_pads = platform.request("amc_rtm_serwb") serwb_pads = platform.request("amc_rtm_serwb")

2
conda/artiq-dev/meta.yaml
View File

@ -15,7 +15,7 @@ requirements:
- python >=3.5.3,<3.6 - python >=3.5.3,<3.6
- setuptools 33.1.1 - setuptools 33.1.1
- migen 0.7 py35_35+git9bc084a - migen 0.7 py35_35+git9bc084a
- misoc 0.11 py35_15+git7f63aff5 - misoc 0.11 py35_18+gitfb92c5ee
- jesd204b 0.6 - jesd204b 0.6
- microscope - microscope
- binutils-or1k-linux >=2.27 - binutils-or1k-linux >=2.27