V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

gpio: Report errors when GPIOs cannot be read 

Some controllers do not allow the output value to be read. Detect this and
report the error in that case.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2015-08-31 18:55:36 -06:00
parent f23baa572f
commit b71bea7129
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cmd/gpio.c
View File

@ -119,7 +119,7 @@ static int do_gpio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
unsigned int gpio; unsigned int gpio;
enum gpio_cmd sub_cmd; enum gpio_cmd sub_cmd;
ulong value; int value;
const char *str_cmd, *str_gpio = NULL; const char *str_cmd, *str_gpio = NULL;
int ret; int ret;
#ifdef CONFIG_DM_GPIO #ifdef CONFIG_DM_GPIO
@ -197,15 +197,35 @@ static int do_gpio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
value = gpio_get_value(gpio); value = gpio_get_value(gpio);
} else { } else {
switch (sub_cmd) { switch (sub_cmd) {
case GPIO_SET: value = 1; break; case GPIO_SET:
case GPIO_CLEAR: value = 0; break; value = 1;
case GPIO_TOGGLE: value = !gpio_get_value(gpio); break; break;
default: goto show_usage; case GPIO_CLEAR:
value = 0;
break;
case GPIO_TOGGLE:
value = gpio_get_value(gpio);
if (!IS_ERR_VALUE(value))
value = !value;
break;
default:
goto show_usage;
} }
gpio_direction_output(gpio, value); gpio_direction_output(gpio, value);
} }
printf("gpio: pin %s (gpio %i) value is %lu\n", printf("gpio: pin %s (gpio %i) value is ", str_gpio, gpio);
str_gpio, gpio, value); if (IS_ERR_VALUE(value))
printf("unknown (ret=%d)\n", value);
else
printf("%d\n", value);
if (sub_cmd != GPIO_INPUT && !IS_ERR_VALUE(value)) {
int nval = gpio_get_value(gpio);
if (IS_ERR_VALUE(nval))
printf(" Warning: no access to GPIO output value\n");
else if (nval != value)
printf(" Warning: value of pin is still %d\n", nval);
}
if (ret != -EBUSY) if (ret != -EBUSY)
gpio_free(gpio); gpio_free(gpio);