Merge branch '2020-05-07-more-kconfig-migrations'

[oweals/u-boot.git] / cmd / gpio.c

diff --git a/cmd/gpio.c b/cmd/gpio.c
index 4ac1f1e4180e1d7bcf3ab7d029d6015415fc9d88..408a942455b58627a81107f3145fe08e33fbeb9f 100644 (file)
--- a/cmd/gpio.c
+++ b/cmd/gpio.c
@@ -10,7 +10,9 @@
 #include <command.h>
 #include <errno.h>
 #include <dm.h>
+#include <malloc.h>
 #include <asm/gpio.h>
+#include <linux/err.h>
 
 __weak int name_to_gpio(const char *name)
 {
@@ -34,7 +36,7 @@ enum {
 };
 
 static void gpio_get_description(struct udevice *dev, const char *bank_name,
-                                int offset, int *flagsp)
+                                int offset, int *flagsp, bool show_all)
 {
        char buf[80];
        int ret;
@@ -42,7 +44,7 @@ static void gpio_get_description(struct udevice *dev, const char *bank_name,
        ret = gpio_get_function(dev, offset, NULL);
        if (ret < 0)
                goto err;
-       if (!(*flagsp & FLAG_SHOW_ALL) && ret == GPIOF_UNUSED)
+       if (!show_all && !(*flagsp & FLAG_SHOW_ALL) && ret == GPIOF_UNUSED)
                return;
        if ((*flagsp & FLAG_SHOW_BANK) && bank_name) {
                if (*flagsp & FLAG_SHOW_NEWLINE) {
@@ -90,19 +92,19 @@ static int do_gpio_status(bool all, const char *gpio_name)
                banklen = bank_name ? strlen(bank_name) : 0;
 
                if (!gpio_name || !bank_name ||
-                   !strncmp(gpio_name, bank_name, banklen)) {
-                       const char *p = NULL;
+                   !strncasecmp(gpio_name, bank_name, banklen)) {
+                       const char *p;
                        int offset;
 
                        p = gpio_name + banklen;
                        if (gpio_name && *p) {
                                offset = simple_strtoul(p, NULL, 10);
                                gpio_get_description(dev, bank_name, offset,
-                                                    &flags);
+                                                    &flags, true);
                        } else {
                                for (offset = 0; offset < num_bits; offset++) {
                                        gpio_get_description(dev, bank_name,
-                                                            offset, &flags);
+                                                    offset, &flags, false);
                                }
                        }
                }
@@ -223,23 +225,40 @@ static int do_gpio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                gpio_direction_output(gpio, value);
        }
        printf("gpio: pin %s (gpio %u) value is ", str_gpio, gpio);
-       if (IS_ERR_VALUE(value))
+
+       if (IS_ERR_VALUE(value)) {
                printf("unknown (ret=%d)\n", value);
-       else
+               goto err;
+       } else {
                printf("%d\n", value);
+       }
+
        if (sub_cmd != GPIOC_INPUT && !IS_ERR_VALUE(value)) {
                int nval = gpio_get_value(gpio);
 
-               if (IS_ERR_VALUE(nval))
+               if (IS_ERR_VALUE(nval)) {
                        printf("   Warning: no access to GPIO output value\n");
-               else if (nval != value)
+                       goto err;
+               } else if (nval != value) {
                        printf("   Warning: value of pin is still %d\n", nval);
+                       goto err;
+               }
        }
 
        if (ret != -EBUSY)
                gpio_free(gpio);
 
-       return value;
+       /*
+        * Whilst wrong, the legacy gpio input command returns the pin
+        * value, or CMD_RET_FAILURE (which is indistinguishable from a
+        * valid pin value).
+        */
+       return (sub_cmd == GPIOC_INPUT) ? value : CMD_RET_SUCCESS;
+
+err:
+       if (ret != -EBUSY)
+               gpio_free(gpio);
+       return CMD_RET_FAILURE;
 }
 
 U_BOOT_CMD(gpio, 4, 0, do_gpio,