diff --git a/src/jtag/drivers/xlnx-pcie-xvc.c b/src/jtag/drivers/xlnx-pcie-xvc.c
index fabf0f39f..48b03ec83 100644
--- a/src/jtag/drivers/xlnx-pcie-xvc.c
+++ b/src/jtag/drivers/xlnx-pcie-xvc.c
@@ -466,16 +466,17 @@ static const struct command_registration xlnx_pcie_xvc_command_handlers[] = {
 	COMMAND_REGISTRATION_DONE
 };
 
-static const char * const xlnx_pcie_xvc_transports[] = { "jtag", NULL };
-
-struct jtag_interface xlnx_pcie_xvc_interface = {
-	.name = "xlnx_pcie_xvc",
-	.commands = xlnx_pcie_xvc_command_handlers,
-	.transports = xlnx_pcie_xvc_transports,
+static struct jtag_interface xlnx_pcie_xvc_interface = {
 	.execute_queue = &xlnx_pcie_xvc_execute_queue,
-	.speed = NULL,
-	.speed_div = NULL,
-	.khz = NULL,
+};
+
+struct adapter_driver xlnx_pcie_xvc_adapter_driver = {
+	.name = "xlnx_pcie_xvc",
+	.transports = jtag_only,
+	.commands = xlnx_pcie_xvc_command_handlers,
+
 	.init = &xlnx_pcie_xvc_init,
 	.quit = &xlnx_pcie_xvc_quit,
+
+	.jtag_ops = &xlnx_pcie_xvc_interface,
 };
diff --git a/src/jtag/interfaces.c b/src/jtag/interfaces.c
index 356d89ecd..00b3bb502 100644
--- a/src/jtag/interfaces.c
+++ b/src/jtag/interfaces.c
@@ -118,7 +118,7 @@ extern struct adapter_driver opendous_adapter_driver;
 extern struct adapter_driver sysfsgpio_adapter_driver;
 #endif
 #if BUILD_XLNX_PCIE_XVC == 1
-extern struct jtag_interface xlnx_pcie_xvc_interface;
+extern struct adapter_driver xlnx_pcie_xvc_adapter_driver;
 #endif
 #if BUILD_AICE == 1
 extern struct adapter_driver aice_adapter_driver;
@@ -229,7 +229,7 @@ struct adapter_driver *adapter_drivers[] = {
 		&sysfsgpio_adapter_driver,
 #endif
 #if BUILD_XLNX_PCIE_XVC == 1
-		&xlnx_pcie_xvc_interface,
+		&xlnx_pcie_xvc_adapter_driver,
 #endif
 #if BUILD_AICE == 1
 		&aice_adapter_driver,