diff options
author | Scott Wood <scottwood@freescale.com> | 2012-12-14 16:03:55 -0600 |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2012-12-14 16:03:55 -0600 |
commit | 88c5c68ffa277bf01b3254cf5a059e2cbe07be97 (patch) | |
tree | f56b444a1c85d94d6a386df090def099632489fe /include/asm-generic/gpio.h | |
parent | 0b38fffbe413fc0725c750d046ca62c23fca196e (diff) | |
parent | 6e9005bd96ff0f0548a787ffafee10664a57a8e1 (diff) | |
download | u-boot-imx-88c5c68ffa277bf01b3254cf5a059e2cbe07be97.zip u-boot-imx-88c5c68ffa277bf01b3254cf5a059e2cbe07be97.tar.gz u-boot-imx-88c5c68ffa277bf01b3254cf5a059e2cbe07be97.tar.bz2 |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'include/asm-generic/gpio.h')
-rw-r--r-- | include/asm-generic/gpio.h | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h index 23c9649..bfedbe4 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h @@ -42,10 +42,11 @@ */ /** - * Request ownership of a GPIO. + * Request a gpio. This should be called before any of the other functions + * are used on this gpio. * - * @param gpio GPIO number - * @param label Name given to the GPIO + * @param gp GPIO number + * @param label User label for this GPIO * @return 0 if ok, -1 on error */ int gpio_request(unsigned gpio, const char *label); @@ -93,14 +94,4 @@ int gpio_get_value(unsigned gpio); * @return 0 if ok, -1 on error */ int gpio_set_value(unsigned gpio, int value); - -/** - * Request a gpio. This should be called before any of the other functions - * are used on this gpio. - * - * @param gp GPIO number - * @param label User label for this GPIO - * @return 0 if ok, -1 on error - */ -int gpio_request(unsigned gpio, const char *label); #endif /* _ASM_GENERIC_GPIO_H_ */ |