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-nand-flash
[oweals/u-boot.git]
/
include
/
ioports.h
diff --git
a/include/ioports.h
b/include/ioports.h
index eba9aee0dd660c136eb1bde568ee50d41d215001..1134ea52081c9e55851330e2fd50e92452c817b3 100644
(file)
--- a/
include/ioports.h
+++ b/
include/ioports.h
@@
-25,8
+25,8
@@
typedef struct {
* the internal memory map aligns the above structure on
* a 0x20 byte boundary
*/
* the internal memory map aligns the above structure on
* a 0x20 byte boundary
*/
-#ifdef CONFIG_MPC85
60
-#define ioport_addr(im, idx) (ioport_t *)((uint)&(
(im)->im_cpm.
im_cpm_iop) + ((idx)*0x20))
+#ifdef CONFIG_MPC85
xx
+#define ioport_addr(im, idx) (ioport_t *)((uint)&(
im->
im_cpm_iop) + ((idx)*0x20))
#else
#define ioport_addr(im, idx) (ioport_t *)((uint)&(im)->im_ioport + ((idx)*0x20))
#endif
#else
#define ioport_addr(im, idx) (ioport_t *)((uint)&(im)->im_ioport + ((idx)*0x20))
#endif
@@
-53,3
+53,13
@@
typedef struct {
* like the table in the 8260UM (and in the hymod manuals).
*/
extern const iop_conf_t iop_conf_tab[4][32];
* like the table in the 8260UM (and in the hymod manuals).
*/
extern const iop_conf_t iop_conf_tab[4][32];
+
+typedef struct {
+ unsigned char port;
+ unsigned char pin;
+ int dir;
+ int open_drain;
+ int assign;
+} qe_iop_conf_t;
+
+#define QE_IOP_TAB_END (-1)