diff options
| author | Tom Rini <trini@ti.com> | 2012-09-21 16:22:18 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-21 16:22:18 -0700 |
| commit | 9fe2cfb43aab2225a8c970a69341534b2488da8c (patch) | |
| tree | 9dbb2228a729857375131191631c305732e4e4cc /include | |
| parent | 495dbd72dd1172de866ba323263a5b62cf454972 (diff) | |
| parent | cf5787f2a4f1af71e72f4faaee32685c8f82a3dd (diff) | |
| download | u-boot-9fe2cfb43aab2225a8c970a69341534b2488da8c.tar.gz | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/gpio.h | 9 | ||||
| -rw-r--r-- | include/fdtdec.h | 3 |
2 files changed, 12 insertions, 0 deletions
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h index c19e16cd21..23c9649403 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h @@ -94,4 +94,13 @@ int gpio_get_value(unsigned gpio); */ 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_ */ diff --git a/include/fdtdec.h b/include/fdtdec.h index 474a4b90ef..0b140752ff 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -19,6 +19,8 @@ * MA 02111-1307 USA */ +#ifndef __fdtdec_h +#define __fdtdec_h /* * This file contains convenience functions for decoding useful and @@ -383,3 +385,4 @@ int fdtdec_get_byte_array(const void *blob, int node, const char *prop_name, */ const u8 *fdtdec_locate_byte_array(const void *blob, int node, const char *prop_name, int count); +#endif |