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 'master' of git://git.denx.de/u-boot-video
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
omap_gpio.h
diff --git
a/arch/arm/include/asm/omap_gpio.h
b/arch/arm/include/asm/omap_gpio.h
index 5d25d04c3bf68f45560aa120faf4182cefca8930..ef38b6308d870b1b4121c622993fe19db2f2851a 100644
(file)
--- a/
arch/arm/include/asm/omap_gpio.h
+++ b/
arch/arm/include/asm/omap_gpio.h
@@
-23,15
+23,23
@@
#include <asm/arch/cpu.h>
#include <asm/arch/cpu.h>
+#ifdef CONFIG_DM_GPIO
+
+/* Information about a GPIO bank */
+struct omap_gpio_platdata {
+ int bank_index;
+ ulong base; /* address of registers in physical memory */
+ const char *port_name;
+};
+
+#else
+
struct gpio_bank {
void *base;
struct gpio_bank {
void *base;
- int method;
};
extern const struct gpio_bank *const omap_gpio_bank;
};
extern const struct gpio_bank *const omap_gpio_bank;
-#define METHOD_GPIO_24XX 4
-
/**
* Check if gpio is valid.
*
/**
* Check if gpio is valid.
*
@@
-39,4
+47,6
@@
extern const struct gpio_bank *const omap_gpio_bank;
* @return 1 if ok, 0 on error
*/
int gpio_is_valid(int gpio);
* @return 1 if ok, 0 on error
*/
int gpio_is_valid(int gpio);
+#endif
+
#endif /* _GPIO_H_ */
#endif /* _GPIO_H_ */