From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 13 Aug 2010 19:48:09 +0000 (-0400)
Subject: Blackfin: cmd_gpio: document/extend input sub-option
X-Git-Tag: v2010.12-rc1~169^2~17
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1729615875d5d443ef68154f7fff6af065301e59;p=u-boot

Blackfin: cmd_gpio: document/extend input sub-option

The input sub command was missing from the help text, and it didn't show
the actual value currently read on the GPIO.  This allows people to read
the value of input pins.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/arch/blackfin/cpu/cmd_gpio.c b/arch/blackfin/cpu/cmd_gpio.c
index 4430c90d4d..5988da7917 100644
--- a/arch/blackfin/cpu/cmd_gpio.c
+++ b/arch/blackfin/cpu/cmd_gpio.c
@@ -90,20 +90,19 @@ int do_gpio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	gpio_request(gpio, "cmd_gpio");
 
 	/* finally, let's do it: set direction and exec command */
+	ulong value;
 	if (sub_cmd == GPIO_INPUT) {
 		gpio_direction_input(gpio);
-		printf("gpio: pin %lu on port %c set to input\n", pin, *str_pin);
-		return 0;
-	}
-
-	ulong value;
-	switch (sub_cmd) {
-		case GPIO_SET:    value = 1; break;
-		case GPIO_CLEAR:  value = 0; break;
-		case GPIO_TOGGLE: value = !gpio_get_value(gpio); break;
-		default:          goto show_usage;
+		value = gpio_get_value(gpio);
+	} else {
+		switch (sub_cmd) {
+			case GPIO_SET:    value = 1; break;
+			case GPIO_CLEAR:  value = 0; break;
+			case GPIO_TOGGLE: value = !gpio_get_value(gpio); break;
+			default:          goto show_usage;
+		}
+		gpio_direction_output(gpio, value);
 	}
-	gpio_direction_output(gpio, value);
 	printf("gpio: pin %lu on port %c (gpio %lu) value is %lu\n",
 		pin, *str_pin, gpio, value);
 
@@ -113,6 +112,6 @@ int do_gpio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 }
 
 U_BOOT_CMD(gpio, 3, 0, do_gpio,
-	"set/clear/toggle gpio output pins",
-	"<set|clear|toggle> <port><pin>\n"
-	"    - set/clear/toggle the specified pin (e.g. PF10)");
+	"input/set/clear/toggle gpio output pins",
+	"<input|set|clear|toggle> <port><pin>\n"
+	"    - input/set/clear/toggle the specified pin (e.g. PF10)");