diff options
author | Tom Rini <trini@konsulko.com> | 2015-05-05 14:57:23 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-05-05 14:57:23 -0400 |
commit | d81572c272d4b0980fb9b8a02e1357090b002398 (patch) | |
tree | 4b2f774d628ab51944f0ba1ff83c15ef6b082a0f /arch/powerpc/include/asm/mpc85xx_gpio.h | |
parent | 1131d4e22cf8f13d0dabaad7f1b84d9baffdfbd6 (diff) | |
parent | 8b0044ff5942943eaa49935f49d5006b346a60f8 (diff) |
Merge git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/include/asm/mpc85xx_gpio.h')
-rw-r--r-- | arch/powerpc/include/asm/mpc85xx_gpio.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/mpc85xx_gpio.h b/arch/powerpc/include/asm/mpc85xx_gpio.h index 87bb4a092b..1d0dad4ccb 100644 --- a/arch/powerpc/include/asm/mpc85xx_gpio.h +++ b/arch/powerpc/include/asm/mpc85xx_gpio.h @@ -72,9 +72,10 @@ static inline int gpio_request(unsigned gpio, const char *label) return 0; } -static inline void gpio_free(unsigned gpio) +static inline int gpio_free(unsigned gpio) { /* Compatibility shim */ + return 0; } static inline int gpio_direction_input(unsigned gpio) @@ -97,12 +98,13 @@ static inline int gpio_get_value(unsigned gpio) return !!mpc85xx_gpio_get(1U << gpio); } -static inline void gpio_set_value(unsigned gpio, int value) +static inline int gpio_set_value(unsigned gpio, int value) { if (value) mpc85xx_gpio_set_high(1U << gpio); else mpc85xx_gpio_set_low(1U << gpio); + return 0; } static inline int gpio_is_valid(int gpio) |