From 2e5b20d53d71063da8fde8ffb175afd7d836240d Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Thu, 30 Nov 2017 12:06:54 +0800
Subject: [PATCH] libboard/hmc830_7043: enable HMC830

---
 artiq/firmware/libboard/hmc830_7043.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/artiq/firmware/libboard/hmc830_7043.rs b/artiq/firmware/libboard/hmc830_7043.rs
index 11b81034b..ab106cd2c 100644
--- a/artiq/firmware/libboard/hmc830_7043.rs
+++ b/artiq/firmware/libboard/hmc830_7043.rs
@@ -21,8 +21,8 @@ mod clock_mux {
         unsafe {
             csr::clock_mux::out_write(
                 1*CLK_SRC_EXT_SEL |  // use ext clk from sma
-                1*REF_CLK_SRC_SEL |  //
-                0*DAC_CLK_SRC_SEL);  // use clk from dac_clk // FIXME (should use hmc830 output)
+                1*REF_CLK_SRC_SEL |
+                1*DAC_CLK_SRC_SEL);
         }
     }
 }
@@ -105,7 +105,7 @@ mod hmc830 {
         }
 
         let t = clock::get_ms();
-        info!("HMC830 waiting for lock...");
+        info!("waiting for lock...");
         while read(0x12) & 0x02 == 0 {
             if clock::get_ms() > t + 2000 {
                 return Err("HMC830 lock timeout");
@@ -180,6 +180,6 @@ mod hmc7043 {
 
 pub fn init() -> Result<(), &'static str> {
     clock_mux::init();
-    //hmc830::init()?; // FIXME
+    hmc830::init()?;
     hmc7043::init()
 }