summaryrefslogtreecommitdiff
path: root/arch/arm/mach-at91/include/mach
diff options
context:
space:
mode:
authorWenyou Yang <wenyou.yang@atmel.com>2017-03-23 12:55:20 +0800
committerSimon Glass <sjg@chromium.org>2017-04-13 14:44:49 -0600
commit8c4e4101d68ca075bba641c88a398ee8ed81b07f (patch)
tree013f434b803ce7d22d57d558968c772336f490c5 /arch/arm/mach-at91/include/mach
parent9a6d2e2a6b0561732e52bd98e71432a7f4e9b3e2 (diff)
ARM: at91: gpio: fix at91_set_gpio_value() define
When the CONFIG_ATMEL_LEGACY is undefined, according to the following defines, at91_set_gpio_value() references to at91_set_pio_value(x, y) with two parameters. #define at91_set_gpio_value(x, y) at91_set_pio_value(x, y) #define at91_get_gpio_value(x) at91_get_pio_value(x) But there isn't the implementation of at91_set_pio_value(x, y) with two parameters in U-Boot. This is an error. Same as at91_get_gpio_value(x) define. Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm/mach-at91/include/mach')
-rw-r--r--arch/arm/mach-at91/include/mach/gpio.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/mach-at91/include/mach/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h
index 5a32bdba8d..df0f71975a 100644
--- a/arch/arm/mach-at91/include/mach/gpio.h
+++ b/arch/arm/mach-at91/include/mach/gpio.h
@@ -223,15 +223,13 @@ static inline unsigned pin_to_mask(unsigned pin)
at91_set_pio_output((x - PIN_BASE) / 32,(x % 32), y)
#define at91_set_gpio_input(x, y) \
at91_set_pio_input((x - PIN_BASE) / 32,(x % 32), y)
-#define at91_set_gpio_value(x, y) \
- at91_set_pio_value((x - PIN_BASE) / 32,(x % 32), y)
-#define at91_get_gpio_value(x) \
- at91_get_pio_value((x - PIN_BASE) / 32,(x % 32))
-#else
-#define at91_set_gpio_value(x, y) at91_set_pio_value(x, y)
-#define at91_get_gpio_value(x) at91_get_pio_value(x)
#endif
+#define at91_set_gpio_value(x, y) \
+ at91_set_pio_value((x / 32), (x % 32), y)
+#define at91_get_gpio_value(x) \
+ at91_get_pio_value((x / 32), (x % 32))
+
#define GPIO_PIOA_BASE (0)
#define GPIO_PIOB_BASE (GPIO_PIOA_BASE + 32)
#define GPIO_PIOC_BASE (GPIO_PIOB_BASE + 32)