projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mmc: fsl_esdhc: drop i.MX DDR support code
[oweals/u-boot.git]
/
cmd
/
gpio.c
diff --git
a/cmd/gpio.c
b/cmd/gpio.c
index c60946bc06934cdf71d03029dd5a4121993a8b3c..eff36ab2af329df34e83bafee24a633a8380ae76 100644
(file)
--- a/
cmd/gpio.c
+++ b/
cmd/gpio.c
@@
-18,10
+18,10
@@
__weak int name_to_gpio(const char *name)
}
enum gpio_cmd {
}
enum gpio_cmd {
- GPIO_INPUT,
- GPIO_SET,
- GPIO_CLEAR,
- GPIO_TOGGLE,
+ GPIO
C
_INPUT,
+ GPIO
C
_SET,
+ GPIO
C
_CLEAR,
+ GPIO
C
_TOGGLE,
};
#if defined(CONFIG_DM_GPIO) && !defined(gpio_status)
};
#if defined(CONFIG_DM_GPIO) && !defined(gpio_status)
@@
-34,7
+34,7
@@
enum {
};
static void gpio_get_description(struct udevice *dev, const char *bank_name,
};
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;
{
char buf[80];
int ret;
@@
-42,7
+42,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;
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) {
return;
if ((*flagsp & FLAG_SHOW_BANK) && bank_name) {
if (*flagsp & FLAG_SHOW_NEWLINE) {
@@
-90,19
+90,19
@@
static int do_gpio_status(bool all, const char *gpio_name)
banklen = bank_name ? strlen(bank_name) : 0;
if (!gpio_name || !bank_name ||
banklen = bank_name ? strlen(bank_name) : 0;
if (!gpio_name || !bank_name ||
- !strncmp(gpio_name, bank_name, banklen)) {
- const char *p
= NULL
;
+ !strnc
asec
mp(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,
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,
} else {
for (offset = 0; offset < num_bits; offset++) {
gpio_get_description(dev, bank_name,
-
offset, &flags
);
+
offset, &flags, false
);
}
}
}
}
}
}
@@
-158,11
+158,20
@@
static int do_gpio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
/* parse the behavior */
switch (*str_cmd) {
/* parse the behavior */
switch (*str_cmd) {
- case 'i': sub_cmd = GPIO_INPUT; break;
- case 's': sub_cmd = GPIO_SET; break;
- case 'c': sub_cmd = GPIO_CLEAR; break;
- case 't': sub_cmd = GPIO_TOGGLE; break;
- default: goto show_usage;
+ case 'i':
+ sub_cmd = GPIOC_INPUT;
+ break;
+ case 's':
+ sub_cmd = GPIOC_SET;
+ break;
+ case 'c':
+ sub_cmd = GPIOC_CLEAR;
+ break;
+ case 't':
+ sub_cmd = GPIOC_TOGGLE;
+ break;
+ default:
+ goto show_usage;
}
#if defined(CONFIG_DM_GPIO)
}
#if defined(CONFIG_DM_GPIO)
@@
-192,18
+201,18
@@
static int do_gpio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
}
/* finally, let's do it: set direction and exec command */
}
/* finally, let's do it: set direction and exec command */
- if (sub_cmd == GPIO_INPUT) {
+ if (sub_cmd == GPIO
C
_INPUT) {
gpio_direction_input(gpio);
value = gpio_get_value(gpio);
} else {
switch (sub_cmd) {
gpio_direction_input(gpio);
value = gpio_get_value(gpio);
} else {
switch (sub_cmd) {
- case GPIO_SET:
+ case GPIO
C
_SET:
value = 1;
break;
value = 1;
break;
- case GPIO_CLEAR:
+ case GPIO
C
_CLEAR:
value = 0;
break;
value = 0;
break;
- case GPIO_TOGGLE:
+ case GPIO
C
_TOGGLE:
value = gpio_get_value(gpio);
if (!IS_ERR_VALUE(value))
value = !value;
value = gpio_get_value(gpio);
if (!IS_ERR_VALUE(value))
value = !value;
@@
-218,7
+227,7
@@
static int do_gpio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
printf("unknown (ret=%d)\n", value);
else
printf("%d\n", value);
printf("unknown (ret=%d)\n", value);
else
printf("%d\n", value);
- if (sub_cmd != GPIO_INPUT && !IS_ERR_VALUE(value)) {
+ if (sub_cmd != GPIO
C
_INPUT && !IS_ERR_VALUE(value)) {
int nval = gpio_get_value(gpio);
if (IS_ERR_VALUE(nval))
int nval = gpio_get_value(gpio);
if (IS_ERR_VALUE(nval))