projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
arch
/
blackfin
/
include
/
asm
/
gpio.h
diff --git
a/arch/blackfin/include/asm/gpio.h
b/arch/blackfin/include/asm/gpio.h
index 58a619110779ed628e51248defb7ae58b02cbfb1..376ec02b650897fa8a52b15ff38f8cc8abf1a48d 100644
(file)
--- a/
arch/blackfin/include/asm/gpio.h
+++ b/
arch/blackfin/include/asm/gpio.h
@@
-8,6
+8,7
@@
#define __ARCH_BLACKFIN_GPIO_H__
#include <asm-generic/gpio.h>
#define __ARCH_BLACKFIN_GPIO_H__
#include <asm-generic/gpio.h>
+#include <asm/portmux.h>
#define gpio_bank(x) ((x) >> 4)
#define gpio_bit(x) (1<<((x) & 0xF))
#define gpio_bank(x) ((x) >> 4)
#define gpio_bit(x) (1<<((x) & 0xF))
@@
-141,6
+142,8
@@
struct gpio_port_t {
unsigned short dummy16;
unsigned short inen;
};
unsigned short dummy16;
unsigned short inen;
};
+#else
+extern struct gpio_port_t * const gpio_array[];
#endif
#ifdef ADI_SPECIAL_GPIO_BANKS
#endif
#ifdef ADI_SPECIAL_GPIO_BANKS