dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 08:42:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

dm: gpio: Allow gpio command to adjust GPIOs that are busy

Browse Source 
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@chromium.org>
This commit is contained in:
Simon Glass
2014-08-11 09:23:53 -06:00
parent 89e6405425
commit 9165e8428d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/cmd_gpio.c
View File

@@ -8,6 +8,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <errno.h>
#include <dm.h> #include <dm.h>
#include <asm/gpio.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; enum gpio_cmd sub_cmd;
ulong value; ulong value;
const char *str_cmd, *str_gpio = NULL; const char *str_cmd, *str_gpio = NULL;
int ret;
#ifdef CONFIG_DM_GPIO #ifdef CONFIG_DM_GPIO
bool all = false; bool all = false;
int ret;
#endif #endif
if (argc < 2) 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; goto show_usage;
#endif #endif
/* grab the pin before we tweak it */ /* 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); printf("gpio: requesting pin %u failed\n", gpio);
return -1; 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", printf("gpio: pin %s (gpio %i) value is %lu\n",
str_gpio, gpio, value); str_gpio, gpio, value);
gpio_free(gpio); if (ret != -EBUSY)
gpio_free(gpio);
return value; return value;
} }