diff --git a/flake.lock b/flake.lock
index 574e13f..a711f0b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -169,11 +169,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1644552039,
-        "narHash": "sha256-fR5qrCLgn/fJN59HQ1/YFv/8w4FMXS/g5UwgBen1G3w=",
+        "lastModified": 1644558411,
+        "narHash": "sha256-PC/gVlVLmtZCv1Tw8Xz5ZCTxqmS2osncg5hlt9BoJ/8=",
         "ref": "master",
-        "rev": "26ab2927b9cec5abb9fcccd85f086971bd73dbe1",
-        "revCount": 603,
+        "rev": "3e95df1f640aa761740feaf9eec797acb58dd942",
+        "revCount": 604,
         "type": "git",
         "url": "https://git.m-labs.hk/m-labs/zynq-rs"
       },
diff --git a/src/Cargo.lock b/src/Cargo.lock
index fa6c97c..a3f5a45 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -224,7 +224,7 @@ dependencies = [
 [[package]]
 name = "libasync"
 version = "0.0.0"
-source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#26ab2927b9cec5abb9fcccd85f086971bd73dbe1"
+source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#3e95df1f640aa761740feaf9eec797acb58dd942"
 dependencies = [
  "embedded-hal",
  "libcortex_a9",
@@ -256,7 +256,7 @@ dependencies = [
 [[package]]
 name = "libboard_zynq"
 version = "0.0.0"
-source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#26ab2927b9cec5abb9fcccd85f086971bd73dbe1"
+source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#3e95df1f640aa761740feaf9eec797acb58dd942"
 dependencies = [
  "bit_field",
  "embedded-hal",
@@ -281,7 +281,7 @@ dependencies = [
 [[package]]
 name = "libconfig"
 version = "0.1.0"
-source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#26ab2927b9cec5abb9fcccd85f086971bd73dbe1"
+source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#3e95df1f640aa761740feaf9eec797acb58dd942"
 dependencies = [
  "core_io",
  "fatfs",
@@ -292,7 +292,7 @@ dependencies = [
 [[package]]
 name = "libcortex_a9"
 version = "0.0.0"
-source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#26ab2927b9cec5abb9fcccd85f086971bd73dbe1"
+source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#3e95df1f640aa761740feaf9eec797acb58dd942"
 dependencies = [
  "bit_field",
  "libregister",
@@ -308,7 +308,7 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 [[package]]
 name = "libregister"
 version = "0.0.0"
-source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#26ab2927b9cec5abb9fcccd85f086971bd73dbe1"
+source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#3e95df1f640aa761740feaf9eec797acb58dd942"
 dependencies = [
  "bit_field",
  "vcell",
@@ -318,7 +318,7 @@ dependencies = [
 [[package]]
 name = "libsupport_zynq"
 version = "0.0.0"
-source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#26ab2927b9cec5abb9fcccd85f086971bd73dbe1"
+source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#3e95df1f640aa761740feaf9eec797acb58dd942"
 dependencies = [
  "cc",
  "compiler_builtins",
diff --git a/src/libboard_artiq/src/si5324.rs b/src/libboard_artiq/src/si5324.rs
index fbb85fe..574fec0 100644
--- a/src/libboard_artiq/src/si5324.rs
+++ b/src/libboard_artiq/src/si5324.rs
@@ -188,12 +188,12 @@ fn init(i2c: &mut I2c, timer: &mut GlobalTimer) -> Result<()> {
 
     #[cfg(feature = "target_kasli_soc")]
     {
-        i2c.pca954x_select(0x70, 0)?;
-        i2c.pca954x_select(0x71, 3)?;
+        i2c.pca954x_select(0x70, None)?;
+        i2c.pca954x_select(0x71, Some(3))?;
     }
     #[cfg(feature = "target_zc706")]
     {
-        i2c.pca954x_select(0x74, 4)?;
+        i2c.pca954x_select(0x74, Some(4))?;
     }
 
     if ident(i2c)? != 0x0182 {