openocd: fix SPDX tag format for files .c
[fw/openocd] / src / jtag / drivers / linuxgpiod.c
index 03afd3da75a913800eea8e1dd5344efc01670f83..d1a88c88d33c919a5d8e2a9ebed94821418ebd32 100644 (file)
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Bitbang driver for Linux GPIO descriptors through libgpiod
  * Copyright (C) 2020 Antonio Borneo <borneo.antonio@gmail.com>
 #endif
 
 #include <gpiod.h>
+#include <jtag/adapter.h>
 #include <jtag/interface.h>
 #include <transport/transport.h>
 #include "bitbang.h"
 
-/* gpio numbers for each gpio. Negative values are invalid */
-static int tck_gpio = -1;
-static int tms_gpio = -1;
-static int tdi_gpio = -1;
-static int tdo_gpio = -1;
-static int trst_gpio = -1;
-static int srst_gpio = -1;
-static int swclk_gpio = -1;
-static int swdio_gpio = -1;
-static int led_gpio = -1;
-static int gpiochip = -1;
-
-static struct gpiod_chip *gpiod_chip;
-static struct gpiod_line *gpiod_tck;
-static struct gpiod_line *gpiod_tms;
-static struct gpiod_line *gpiod_tdi;
-static struct gpiod_line *gpiod_tdo;
-static struct gpiod_line *gpiod_trst;
-static struct gpiod_line *gpiod_swclk;
-static struct gpiod_line *gpiod_swdio;
-static struct gpiod_line *gpiod_srst;
-static struct gpiod_line *gpiod_led;
+static struct gpiod_chip *gpiod_chip[ADAPTER_GPIO_IDX_NUM] = {};
+static struct gpiod_line *gpiod_line[ADAPTER_GPIO_IDX_NUM] = {};
 
 static int last_swclk;
 static int last_swdio;
 static bool last_stored;
 static bool swdio_input;
 
+static const struct adapter_gpio_config *adapter_gpio_config;
+
+/*
+ * Helper function to determine if gpio config is valid
+ *
+ * Assume here that there will be less than 10000 gpios per gpiochip, and less
+ * than 1000 gpiochips.
+ */
+static bool is_gpio_config_valid(enum adapter_gpio_config_index idx)
+{
+       return adapter_gpio_config[idx].chip_num >= 0
+               && adapter_gpio_config[idx].chip_num < 1000
+               && adapter_gpio_config[idx].gpio_num >= 0
+               && adapter_gpio_config[idx].gpio_num < 10000;
+}
+
 /* Bitbang interface read of TDO */
 static bb_value_t linuxgpiod_read(void)
 {
        int retval;
 
-       retval = gpiod_line_get_value(gpiod_tdo);
+       retval = gpiod_line_get_value(gpiod_line[ADAPTER_GPIO_IDX_TDO]);
        if (retval < 0) {
                LOG_WARNING("reading tdo failed");
                return 0;
@@ -84,20 +81,20 @@ static int linuxgpiod_write(int tck, int tms, int tdi)
        }
 
        if (tdi != last_tdi) {
-               retval = gpiod_line_set_value(gpiod_tdi, tdi);
+               retval = gpiod_line_set_value(gpiod_line[ADAPTER_GPIO_IDX_TDI], tdi);
                if (retval < 0)
                        LOG_WARNING("writing tdi failed");
        }
 
        if (tms != last_tms) {
-               retval = gpiod_line_set_value(gpiod_tms, tms);
+               retval = gpiod_line_set_value(gpiod_line[ADAPTER_GPIO_IDX_TMS], tms);
                if (retval < 0)
                        LOG_WARNING("writing tms failed");
        }
 
        /* write clk last */
        if (tck != last_tck) {
-               retval = gpiod_line_set_value(gpiod_tck, tck);
+               retval = gpiod_line_set_value(gpiod_line[ADAPTER_GPIO_IDX_TCK], tck);
                if (retval < 0)
                        LOG_WARNING("writing tck failed");
        }
@@ -113,7 +110,7 @@ static int linuxgpiod_swdio_read(void)
 {
        int retval;
 
-       retval = gpiod_line_get_value(gpiod_swdio);
+       retval = gpiod_line_get_value(gpiod_line[ADAPTER_GPIO_IDX_SWDIO]);
        if (retval < 0) {
                LOG_WARNING("Fail read swdio");
                return 0;
@@ -131,16 +128,26 @@ static void linuxgpiod_swdio_drive(bool is_output)
         * https://stackoverflow.com/questions/58735140/
         * this would change in future libgpiod
         */
-       gpiod_line_release(gpiod_swdio);
+       gpiod_line_release(gpiod_line[ADAPTER_GPIO_IDX_SWDIO]);
 
        if (is_output) {
-               retval = gpiod_line_request_output(gpiod_swdio, "OpenOCD", 1);
+               if (gpiod_line[ADAPTER_GPIO_IDX_SWDIO_DIR]) {
+                       retval = gpiod_line_set_value(gpiod_line[ADAPTER_GPIO_IDX_SWDIO_DIR], 1);
+                       if (retval < 0)
+                               LOG_WARNING("Fail set swdio_dir");
+               }
+               retval = gpiod_line_request_output(gpiod_line[ADAPTER_GPIO_IDX_SWDIO], "OpenOCD", 1);
                if (retval < 0)
                        LOG_WARNING("Fail request_output line swdio");
        } else {
-               retval = gpiod_line_request_input(gpiod_swdio, "OpenOCD");
+               retval = gpiod_line_request_input(gpiod_line[ADAPTER_GPIO_IDX_SWDIO], "OpenOCD");
                if (retval < 0)
                        LOG_WARNING("Fail request_input line swdio");
+               if (gpiod_line[ADAPTER_GPIO_IDX_SWDIO_DIR]) {
+                       retval = gpiod_line_set_value(gpiod_line[ADAPTER_GPIO_IDX_SWDIO_DIR], 0);
+                       if (retval < 0)
+                               LOG_WARNING("Fail set swdio_dir");
+               }
        }
 
        last_stored = false;
@@ -153,7 +160,7 @@ static int linuxgpiod_swd_write(int swclk, int swdio)
 
        if (!swdio_input) {
                if (!last_stored || (swdio != last_swdio)) {
-                       retval = gpiod_line_set_value(gpiod_swdio, swdio);
+                       retval = gpiod_line_set_value(gpiod_line[ADAPTER_GPIO_IDX_SWDIO], swdio);
                        if (retval < 0)
                                LOG_WARNING("Fail set swdio");
                }
@@ -161,7 +168,7 @@ static int linuxgpiod_swd_write(int swclk, int swdio)
 
        /* write swclk last */
        if (!last_stored || (swclk != last_swclk)) {
-               retval = gpiod_line_set_value(gpiod_swclk, swclk);
+               retval = gpiod_line_set_value(gpiod_line[ADAPTER_GPIO_IDX_SWCLK], swclk);
                if (retval < 0)
                        LOG_WARNING("Fail set swclk");
        }
@@ -177,10 +184,10 @@ static int linuxgpiod_blink(int on)
 {
        int retval;
 
-       if (!gpiod_led)
+       if (!is_gpio_config_valid(ADAPTER_GPIO_IDX_LED))
                return ERROR_OK;
 
-       retval = gpiod_line_set_value(gpiod_led, on);
+       retval = gpiod_line_set_value(gpiod_line[ADAPTER_GPIO_IDX_LED], on);
        if (retval < 0)
                LOG_WARNING("Fail set led");
        return retval;
@@ -206,16 +213,18 @@ static int linuxgpiod_reset(int trst, int srst)
 
        LOG_DEBUG("linuxgpiod_reset");
 
-       /* assume active low */
-       if (gpiod_srst) {
-               retval1 = gpiod_line_set_value(gpiod_srst, srst ? 0 : 1);
+       /*
+        * active low behaviour handled by "adaptor gpio" command and
+        * GPIOD_LINE_REQUEST_FLAG_ACTIVE_LOW flag when requesting the line.
+        */
+       if (gpiod_line[ADAPTER_GPIO_IDX_SRST]) {
+               retval1 = gpiod_line_set_value(gpiod_line[ADAPTER_GPIO_IDX_SRST], srst);
                if (retval1 < 0)
                        LOG_WARNING("set srst value failed");
        }
 
-       /* assume active low */
-       if (gpiod_trst) {
-               retval2 = gpiod_line_set_value(gpiod_trst, trst ? 0 : 1);
+       if (gpiod_line[ADAPTER_GPIO_IDX_TRST]) {
+               retval2 = gpiod_line_set_value(gpiod_line[ADAPTER_GPIO_IDX_TRST], trst);
                if (retval2 < 0)
                        LOG_WARNING("set trst value failed");
        }
@@ -223,99 +232,134 @@ static int linuxgpiod_reset(int trst, int srst)
        return ((retval1 < 0) || (retval2 < 0)) ? ERROR_FAIL : ERROR_OK;
 }
 
-/*
- * Helper function to determine if gpio number is valid
- *
- * Assume here that there will be less than 10000 gpios per gpiochip
- */
-static bool is_gpio_valid(int gpio)
-{
-       return gpio >= 0 && gpio < 10000;
-}
-
 static bool linuxgpiod_jtag_mode_possible(void)
 {
-       if (!is_gpio_valid(tck_gpio))
+       if (!is_gpio_config_valid(ADAPTER_GPIO_IDX_TCK))
                return false;
-       if (!is_gpio_valid(tms_gpio))
+       if (!is_gpio_config_valid(ADAPTER_GPIO_IDX_TMS))
                return false;
-       if (!is_gpio_valid(tdi_gpio))
+       if (!is_gpio_config_valid(ADAPTER_GPIO_IDX_TDI))
                return false;
-       if (!is_gpio_valid(tdo_gpio))
+       if (!is_gpio_config_valid(ADAPTER_GPIO_IDX_TDO))
                return false;
        return true;
 }
 
 static bool linuxgpiod_swd_mode_possible(void)
 {
-       if (!is_gpio_valid(swclk_gpio))
+       if (!is_gpio_config_valid(ADAPTER_GPIO_IDX_SWCLK))
                return false;
-       if (!is_gpio_valid(swdio_gpio))
+       if (!is_gpio_config_valid(ADAPTER_GPIO_IDX_SWDIO))
                return false;
        return true;
 }
 
-static inline void helper_release(struct gpiod_line *line)
+static inline void helper_release(enum adapter_gpio_config_index idx)
 {
-       if (line)
-               gpiod_line_release(line);
+       if (gpiod_line[idx]) {
+               gpiod_line_release(gpiod_line[idx]);
+               gpiod_line[idx] = NULL;
+       }
+       if (gpiod_chip[idx]) {
+               gpiod_chip_close(gpiod_chip[idx]);
+               gpiod_chip[idx] = NULL;
+       }
 }
 
 static int linuxgpiod_quit(void)
 {
-       helper_release(gpiod_led);
-       helper_release(gpiod_srst);
-       helper_release(gpiod_swdio);
-       helper_release(gpiod_swclk);
-       helper_release(gpiod_trst);
-       helper_release(gpiod_tms);
-       helper_release(gpiod_tck);
-       helper_release(gpiod_tdi);
-       helper_release(gpiod_tdo);
-
-       gpiod_chip_close(gpiod_chip);
+       LOG_DEBUG("linuxgpiod_quit");
+       for (int i = 0; i < ADAPTER_GPIO_IDX_NUM; ++i)
+               helper_release(i);
 
        return ERROR_OK;
 }
 
-static struct gpiod_line *helper_get_input_line(const char *label, unsigned int offset)
+static int helper_get_line(enum adapter_gpio_config_index idx)
 {
-       struct gpiod_line *line;
-       int retval;
+       if (!is_gpio_config_valid(idx))
+               return ERROR_OK;
+
+       int dir = GPIOD_LINE_REQUEST_DIRECTION_INPUT, flags = 0, val = 0, retval;
 
-       line = gpiod_chip_get_line(gpiod_chip, offset);
-       if (!line) {
-               LOG_ERROR("Error get line %s", label);
-               return NULL;
+       gpiod_chip[idx] = gpiod_chip_open_by_number(adapter_gpio_config[idx].chip_num);
+       if (!gpiod_chip[idx]) {
+               LOG_ERROR("Cannot open LinuxGPIOD chip %d for %s", adapter_gpio_config[idx].chip_num,
+                       adapter_gpio_get_name(idx));
+               return ERROR_JTAG_INIT_FAILED;
        }
 
-       retval = gpiod_line_request_input(line, "OpenOCD");
-       if (retval < 0) {
-               LOG_ERROR("Error request_input line %s", label);
-               return NULL;
+       gpiod_line[idx] = gpiod_chip_get_line(gpiod_chip[idx], adapter_gpio_config[idx].gpio_num);
+       if (!gpiod_line[idx]) {
+               LOG_ERROR("Error get line %s", adapter_gpio_get_name(idx));
+               return ERROR_JTAG_INIT_FAILED;
        }
 
-       return line;
-}
+       switch (adapter_gpio_config[idx].init_state) {
+       case ADAPTER_GPIO_INIT_STATE_INPUT:
+               dir = GPIOD_LINE_REQUEST_DIRECTION_INPUT;
+               break;
+       case ADAPTER_GPIO_INIT_STATE_INACTIVE:
+               dir = GPIOD_LINE_REQUEST_DIRECTION_OUTPUT;
+               val = 0;
+               break;
+       case ADAPTER_GPIO_INIT_STATE_ACTIVE:
+               dir = GPIOD_LINE_REQUEST_DIRECTION_OUTPUT;
+               val = 1;
+               break;
+       }
 
-static struct gpiod_line *helper_get_output_line(const char *label, unsigned int offset, int val)
-{
-       struct gpiod_line *line;
-       int retval;
+       switch (adapter_gpio_config[idx].drive) {
+       case ADAPTER_GPIO_DRIVE_MODE_PUSH_PULL:
+               break;
+       case ADAPTER_GPIO_DRIVE_MODE_OPEN_DRAIN:
+               flags |= GPIOD_LINE_REQUEST_FLAG_OPEN_DRAIN;
+               break;
+       case ADAPTER_GPIO_DRIVE_MODE_OPEN_SOURCE:
+               flags |= GPIOD_LINE_REQUEST_FLAG_OPEN_SOURCE;
+               break;
+       }
 
-       line = gpiod_chip_get_line(gpiod_chip, offset);
-       if (!line) {
-               LOG_ERROR("Error get line %s", label);
-               return NULL;
+       switch (adapter_gpio_config[idx].pull) {
+       case ADAPTER_GPIO_PULL_NONE:
+#ifdef GPIOD_LINE_REQUEST_FLAG_BIAS_DISABLE
+               flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_DISABLE;
+#endif
+               break;
+       case ADAPTER_GPIO_PULL_UP:
+#ifdef GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_UP
+               flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_UP;
+#else
+               LOG_WARNING("linuxgpiod: ignoring request for pull-up on %s: not supported by gpiod v%s",
+                       adapter_gpio_get_name(idx), gpiod_version_string());
+#endif
+               break;
+       case ADAPTER_GPIO_PULL_DOWN:
+#ifdef GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_DOWN
+               flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_DOWN;
+#else
+               LOG_WARNING("linuxgpiod: ignoring request for pull-down on %s: not supported by gpiod v%s",
+                       adapter_gpio_get_name(idx), gpiod_version_string());
+#endif
+               break;
        }
 
-       retval = gpiod_line_request_output(line, "OpenOCD", val);
+       if (adapter_gpio_config[idx].active_low)
+               flags |= GPIOD_LINE_REQUEST_FLAG_ACTIVE_LOW;
+
+       struct gpiod_line_request_config config = {
+               .consumer = "OpenOCD",
+               .request_type = dir,
+               .flags = flags,
+       };
+
+       retval = gpiod_line_request(gpiod_line[idx], &config, val);
        if (retval < 0) {
-               LOG_ERROR("Error request_output line %s", label);
-               return NULL;
+               LOG_ERROR("Error requesting gpio line %s", adapter_gpio_get_name(idx));
+               return ERROR_JTAG_INIT_FAILED;
        }
 
-       return line;
+       return ERROR_OK;
 }
 
 static int linuxgpiod_init(void)
@@ -323,17 +367,11 @@ static int linuxgpiod_init(void)
        LOG_INFO("Linux GPIOD JTAG/SWD bitbang driver");
 
        bitbang_interface = &linuxgpiod_bitbang;
-
-       gpiod_chip = gpiod_chip_open_by_number(gpiochip);
-       if (!gpiod_chip) {
-               LOG_ERROR("Cannot open LinuxGPIOD gpiochip %d", gpiochip);
-               return ERROR_JTAG_INIT_FAILED;
-       }
+       adapter_gpio_config = adapter_gpio_get_config();
 
        /*
-        * Configure TDO as an input, and TDI, TCK, TMS, TRST, SRST
-        * as outputs.  Drive TDI and TCK low, and TMS/TRST/SRST high.
-        * For SWD, SWCLK and SWDIO are configures as output high.
+        * Configure JTAG/SWD signals. Default directions and initial states are handled
+        * by adapter.c and "adapter gpio" command.
         */
 
        if (transport_is_jtag()) {
@@ -342,55 +380,44 @@ static int linuxgpiod_init(void)
                        goto out_error;
                }
 
-               gpiod_tdo = helper_get_input_line("tdo", tdo_gpio);
-               if (!gpiod_tdo)
-                       goto out_error;
-
-               gpiod_tdi = helper_get_output_line("tdi", tdi_gpio, 0);
-               if (!gpiod_tdi)
-                       goto out_error;
-
-               gpiod_tck = helper_get_output_line("tck", tck_gpio, 0);
-               if (!gpiod_tck)
-                       goto out_error;
-
-               gpiod_tms = helper_get_output_line("tms", tms_gpio, 1);
-               if (!gpiod_tms)
-                       goto out_error;
-
-               if (is_gpio_valid(trst_gpio)) {
-                       gpiod_trst = helper_get_output_line("trst", trst_gpio, 1);
-                       if (!gpiod_trst)
+               if (helper_get_line(ADAPTER_GPIO_IDX_TDO) != ERROR_OK ||
+                       helper_get_line(ADAPTER_GPIO_IDX_TDI) != ERROR_OK ||
+                       helper_get_line(ADAPTER_GPIO_IDX_TCK) != ERROR_OK ||
+                       helper_get_line(ADAPTER_GPIO_IDX_TMS) != ERROR_OK ||
+                       helper_get_line(ADAPTER_GPIO_IDX_TRST) != ERROR_OK)
                                goto out_error;
-               }
        }
 
        if (transport_is_swd()) {
+               int retval1, retval2;
                if (!linuxgpiod_swd_mode_possible()) {
                        LOG_ERROR("Require swclk and swdio gpio for SWD mode");
                        goto out_error;
                }
 
-               gpiod_swclk = helper_get_output_line("swclk", swclk_gpio, 1);
-               if (!gpiod_swclk)
+               /*
+                * swdio and its buffer should be initialized in the order that prevents
+                * two outputs from being connected together. This will occur if the
+                * swdio GPIO is configured as an output while the external buffer is
+                * configured to send the swdio signal from the target to the GPIO.
+                */
+               if (adapter_gpio_config[ADAPTER_GPIO_IDX_SWDIO].init_state == ADAPTER_GPIO_INIT_STATE_INPUT) {
+                       retval1 = helper_get_line(ADAPTER_GPIO_IDX_SWDIO);
+                       retval2 = helper_get_line(ADAPTER_GPIO_IDX_SWDIO_DIR);
+               } else {
+                       retval1 = helper_get_line(ADAPTER_GPIO_IDX_SWDIO_DIR);
+                       retval2 = helper_get_line(ADAPTER_GPIO_IDX_SWDIO);
+               }
+               if (retval1 != ERROR_OK || retval2 != ERROR_OK)
                        goto out_error;
 
-               gpiod_swdio = helper_get_output_line("swdio", swdio_gpio, 1);
-               if (!gpiod_swdio)
+               if (helper_get_line(ADAPTER_GPIO_IDX_SWCLK) != ERROR_OK)
                        goto out_error;
        }
 
-       if (is_gpio_valid(srst_gpio)) {
-               gpiod_srst = helper_get_output_line("srst", srst_gpio, 1);
-               if (!gpiod_srst)
+       if (helper_get_line(ADAPTER_GPIO_IDX_SRST) != ERROR_OK ||
+               helper_get_line(ADAPTER_GPIO_IDX_LED) != ERROR_OK)
                        goto out_error;
-       }
-
-       if (is_gpio_valid(led_gpio)) {
-               gpiod_led = helper_get_output_line("led", led_gpio, 0);
-               if (!gpiod_led)
-                       goto out_error;
-       }
 
        return ERROR_OK;
 
@@ -400,218 +427,6 @@ out_error:
        return ERROR_JTAG_INIT_FAILED;
 }
 
-COMMAND_HANDLER(linuxgpiod_handle_jtag_gpionums)
-{
-       if (CMD_ARGC == 4) {
-               COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], tck_gpio);
-               COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], tms_gpio);
-               COMMAND_PARSE_NUMBER(int, CMD_ARGV[2], tdi_gpio);
-               COMMAND_PARSE_NUMBER(int, CMD_ARGV[3], tdo_gpio);
-       } else if (CMD_ARGC != 0) {
-               return ERROR_COMMAND_SYNTAX_ERROR;
-       }
-
-       command_print(CMD,
-                       "LinuxGPIOD nums: tck = %d, tms = %d, tdi = %d, tdo = %d",
-                       tck_gpio, tms_gpio, tdi_gpio, tdo_gpio);
-
-       return ERROR_OK;
-}
-
-COMMAND_HANDLER(linuxgpiod_handle_jtag_gpionum_tck)
-{
-       if (CMD_ARGC == 1)
-               COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], tck_gpio);
-
-       command_print(CMD, "LinuxGPIOD num: tck = %d", tck_gpio);
-       return ERROR_OK;
-}
-
-COMMAND_HANDLER(linuxgpiod_handle_jtag_gpionum_tms)
-{
-       if (CMD_ARGC == 1)
-               COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], tms_gpio);
-
-       command_print(CMD, "LinuxGPIOD num: tms = %d", tms_gpio);
-       return ERROR_OK;
-}
-
-COMMAND_HANDLER(linuxgpiod_handle_jtag_gpionum_tdo)
-{
-       if (CMD_ARGC == 1)
-               COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], tdo_gpio);
-
-       command_print(CMD, "LinuxGPIOD num: tdo = %d", tdo_gpio);
-       return ERROR_OK;
-}
-
-COMMAND_HANDLER(linuxgpiod_handle_jtag_gpionum_tdi)
-{
-       if (CMD_ARGC == 1)
-               COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], tdi_gpio);
-
-       command_print(CMD, "LinuxGPIOD num: tdi = %d", tdi_gpio);
-       return ERROR_OK;
-}
-
-COMMAND_HANDLER(linuxgpiod_handle_jtag_gpionum_srst)
-{
-       if (CMD_ARGC == 1)
-               COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], srst_gpio);
-
-       command_print(CMD, "LinuxGPIOD num: srst = %d", srst_gpio);
-       return ERROR_OK;
-}
-
-COMMAND_HANDLER(linuxgpiod_handle_jtag_gpionum_trst)
-{
-       if (CMD_ARGC == 1)
-               COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], trst_gpio);
-
-       command_print(CMD, "LinuxGPIOD num: trst = %d", trst_gpio);
-       return ERROR_OK;
-}
-
-COMMAND_HANDLER(linuxgpiod_handle_swd_gpionums)
-{
-       if (CMD_ARGC == 2) {
-               COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], swclk_gpio);
-               COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], swdio_gpio);
-       } else if (CMD_ARGC != 0) {
-               return ERROR_COMMAND_SYNTAX_ERROR;
-       }
-
-       command_print(CMD,
-                       "LinuxGPIOD nums: swclk = %d, swdio = %d",
-                       swclk_gpio, swdio_gpio);
-
-       return ERROR_OK;
-}
-
-COMMAND_HANDLER(linuxgpiod_handle_swd_gpionum_swclk)
-{
-       if (CMD_ARGC == 1)
-               COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], swclk_gpio);
-
-       command_print(CMD, "LinuxGPIOD num: swclk = %d", swclk_gpio);
-       return ERROR_OK;
-}
-
-COMMAND_HANDLER(linuxgpiod_handle_swd_gpionum_swdio)
-{
-       if (CMD_ARGC == 1)
-               COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], swdio_gpio);
-
-       command_print(CMD, "LinuxGPIOD num: swdio = %d", swdio_gpio);
-       return ERROR_OK;
-}
-
-COMMAND_HANDLER(linuxgpiod_handle_gpionum_led)
-{
-       if (CMD_ARGC == 1)
-               COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], led_gpio);
-
-       command_print(CMD, "LinuxGPIOD num: led = %d", led_gpio);
-       return ERROR_OK;
-}
-
-COMMAND_HANDLER(linuxgpiod_handle_gpiochip)
-{
-       if (CMD_ARGC == 1)
-               COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], gpiochip);
-
-       command_print(CMD, "LinuxGPIOD gpiochip = %d", gpiochip);
-       return ERROR_OK;
-}
-
-static const struct command_registration linuxgpiod_command_handlers[] = {
-       {
-               .name = "linuxgpiod_jtag_nums",
-               .handler = linuxgpiod_handle_jtag_gpionums,
-               .mode = COMMAND_CONFIG,
-               .help = "gpio numbers for tck, tms, tdi, tdo. (in that order)",
-               .usage = "tck tms tdi tdo",
-       },
-       {
-               .name = "linuxgpiod_tck_num",
-               .handler = linuxgpiod_handle_jtag_gpionum_tck,
-               .mode = COMMAND_CONFIG,
-               .help = "gpio number for tck.",
-               .usage = "tck",
-       },
-       {
-               .name = "linuxgpiod_tms_num",
-               .handler = linuxgpiod_handle_jtag_gpionum_tms,
-               .mode = COMMAND_CONFIG,
-               .help = "gpio number for tms.",
-               .usage = "tms",
-       },
-       {
-               .name = "linuxgpiod_tdo_num",
-               .handler = linuxgpiod_handle_jtag_gpionum_tdo,
-               .mode = COMMAND_CONFIG,
-               .help = "gpio number for tdo.",
-               .usage = "tdo",
-       },
-       {
-               .name = "linuxgpiod_tdi_num",
-               .handler = linuxgpiod_handle_jtag_gpionum_tdi,
-               .mode = COMMAND_CONFIG,
-               .help = "gpio number for tdi.",
-               .usage = "tdi",
-       },
-       {
-               .name = "linuxgpiod_srst_num",
-               .handler = linuxgpiod_handle_jtag_gpionum_srst,
-               .mode = COMMAND_CONFIG,
-               .help = "gpio number for srst.",
-               .usage = "srst",
-       },
-       {
-               .name = "linuxgpiod_trst_num",
-               .handler = linuxgpiod_handle_jtag_gpionum_trst,
-               .mode = COMMAND_CONFIG,
-               .help = "gpio number for trst.",
-               .usage = "trst",
-       },
-       {
-               .name = "linuxgpiod_swd_nums",
-               .handler = linuxgpiod_handle_swd_gpionums,
-               .mode = COMMAND_CONFIG,
-               .help = "gpio numbers for swclk, swdio. (in that order)",
-               .usage = "swclk swdio",
-       },
-       {
-               .name = "linuxgpiod_swclk_num",
-               .handler = linuxgpiod_handle_swd_gpionum_swclk,
-               .mode = COMMAND_CONFIG,
-               .help = "gpio number for swclk.",
-               .usage = "swclk",
-       },
-       {
-               .name = "linuxgpiod_swdio_num",
-               .handler = linuxgpiod_handle_swd_gpionum_swdio,
-               .mode = COMMAND_CONFIG,
-               .help = "gpio number for swdio.",
-               .usage = "swdio",
-       },
-       {
-               .name = "linuxgpiod_led_num",
-               .handler = linuxgpiod_handle_gpionum_led,
-               .mode = COMMAND_CONFIG,
-               .help = "gpio number for LED.",
-               .usage = "led",
-       },
-       {
-               .name = "linuxgpiod_gpiochip",
-               .handler = linuxgpiod_handle_gpiochip,
-               .mode = COMMAND_CONFIG,
-               .help = "number of the gpiochip.",
-               .usage = "gpiochip",
-       },
-       COMMAND_REGISTRATION_DONE
-};
-
 static const char *const linuxgpiod_transport[] = { "swd", "jtag", NULL };
 
 static struct jtag_interface linuxgpiod_interface = {
@@ -622,7 +437,6 @@ static struct jtag_interface linuxgpiod_interface = {
 struct adapter_driver linuxgpiod_adapter_driver = {
        .name = "linuxgpiod",
        .transports = linuxgpiod_transport,
-       .commands = linuxgpiod_command_handlers,
 
        .init = linuxgpiod_init,
        .quit = linuxgpiod_quit,