[U-Boot] [PATCH v6 02/12] dm: gpio: Allow gpio command to adjust GPIOs that are busy

[Simon Glass]

The gpio command mostly relies on gpio_request() and gpio_free() being
nops, in that you can request a GPIO twice. With driver model this is
now implemented correctly, so it fails.

Change the command to deal with a failure to claim the GPIO.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

Changes in v6:
- Add new patch to allow gpio command to adjust GPIOs that are busy

Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None

 common/cmd_gpio.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/cmd_gpio.c b/common/cmd_gpio.c
index b97533f..11f4e40 100644
--- a/common/cmd_gpio.c
+++ b/common/cmd_gpio.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <errno.h>
 #include <dm.h>
 #include <asm/gpio.h>
 
@@ -135,9 +136,9 @@ static int do_gpio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	enum gpio_cmd sub_cmd;
 	ulong value;
 	const char *str_cmd, *str_gpio = NULL;
+	int ret;
 #ifdef CONFIG_DM_GPIO
 	bool all = false;
-	int ret;
 #endif
 
 	if (argc < 2)
@@ -197,7 +198,8 @@ static int do_gpio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		goto show_usage;
 #endif
 	/* grab the pin before we tweak it */
-	if (gpio_request(gpio, "cmd_gpio")) {
+	ret = gpio_request(gpio, "cmd_gpio");
+	if (ret && ret != -EBUSY) {
 		printf("gpio: requesting pin %u failed\n", gpio);
 		return -1;
 	}
@@ -218,7 +220,8 @@ static int do_gpio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	printf("gpio: pin %s (gpio %i) value is %lu\n",
 		str_gpio, gpio, value);
 
-	gpio_free(gpio);
+	if (ret != -EBUSY)
+		gpio_free(gpio);
 
 	return value;
 }
-- 
2.0.0.526.g5318336