summaryrefslogtreecommitdiffstats
path: root/arch/blackfin/include/asm
diff options
context:
space:
mode:
authorSteven Miao <realmz6@gmail.com>2013-10-23 14:44:09 +0800
committerSonic Zhang <sonic.zhang@analog.com>2013-11-04 16:50:46 +0800
commitcae4d0403c0863176f228d410d6a29b3f4b9d595 (patch)
treedee074ffc6a5e9d7817990ff333ce7b9191d454c /arch/blackfin/include/asm
parent84682854b61008ffa0757fb33551320e94d49881 (diff)
downloadtalos-obmc-uboot-cae4d0403c0863176f228d410d6a29b3f4b9d595.tar.gz
talos-obmc-uboot-cae4d0403c0863176f228d410d6a29b3f4b9d595.zip
blackfin: Move machine specific gpio_port_t structure back to blackfin arch folder.
The gpio register mappings are different among blackfin processors. Signed-off-by: Steven Miao <realmz6@gmail.com> Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Diffstat (limited to 'arch/blackfin/include/asm')
-rw-r--r--arch/blackfin/include/asm/gpio.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/gpio.h b/arch/blackfin/include/asm/gpio.h
index 58a6191107..376ec02b65 100644
--- 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>
+#include <asm/portmux.h>
#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;
};
+#else
+extern struct gpio_port_t * const gpio_array[];
#endif
#ifdef ADI_SPECIAL_GPIO_BANKS
OpenPOWER on IntegriCloud