From fdba0bfbbc1c5155bc7cb0ee83cd7d0500acea5f Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sun, 6 Oct 2019 19:22:46 +0800 Subject: [PATCH] satman: move now-unrelated hmc830_7043 init away from DRTIO transceiver init --- artiq/firmware/satman/main.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/artiq/firmware/satman/main.rs b/artiq/firmware/satman/main.rs index b71386d70..b0c41543f 100644 --- a/artiq/firmware/satman/main.rs +++ b/artiq/firmware/satman/main.rs @@ -414,15 +414,15 @@ pub extern fn main() -> i32 { i2c::init(); si5324::setup(&SI5324_SETTINGS, si5324::Input::Ckin1).expect("cannot initialize Si5324"); - #[cfg(has_hmc830_7043)] - /* must be the first SPI init because of HMC830 SPI mode selection */ - hmc830_7043::init().expect("cannot initialize HMC830/7043"); unsafe { csr::drtio_transceiver::stable_clkin_write(1); } clock::spin_us(1500); // wait for CPLL/QPLL lock init_rtio_crg(); + #[cfg(has_hmc830_7043)] + /* must be the first SPI init because of HMC830 SPI mode selection */ + hmc830_7043::init().expect("cannot initialize HMC830/7043"); #[cfg(has_allaki_atts)] board_artiq::hmc542::program_all(8/*=4dB*/);