diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-02-22 22:51:32 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-02-22 22:51:32 +0100 |
| commit | cea221116aa305dbf43625513a1210b89116262b (patch) | |
| tree | f9dbc5ccf72b7003104e6b61e09a82153cbb69aa /include/asm-arm/arch-omap3/omap3.h | |
| parent | 68a41f2e98b6866d679698cf2b5e81b3627a2d75 (diff) | |
| parent | 9d34d0a0c12266d80e7b3ab3cbdafc3d81a01832 (diff) | |
| download | u-boot-imx-cea221116aa305dbf43625513a1210b89116262b.zip u-boot-imx-cea221116aa305dbf43625513a1210b89116262b.tar.gz u-boot-imx-cea221116aa305dbf43625513a1210b89116262b.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'include/asm-arm/arch-omap3/omap3.h')
| -rw-r--r-- | include/asm-arm/arch-omap3/omap3.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-arm/arch-omap3/omap3.h b/include/asm-arm/arch-omap3/omap3.h index 7473656..02e36d7 100644 --- a/include/asm-arm/arch-omap3/omap3.h +++ b/include/asm-arm/arch-omap3/omap3.h @@ -97,7 +97,8 @@ typedef struct s32ktimer { typedef struct gpio { unsigned char res1[0x34]; unsigned int oe; /* 0x34 */ - unsigned char res2[0x58]; + unsigned int datain; /* 0x38 */ + unsigned char res2[0x54]; unsigned int cleardataout; /* 0x90 */ unsigned int setdataout; /* 0x94 */ } gpio_t; @@ -202,6 +203,8 @@ typedef struct gpio { #define VAUX2_DEDICATED 0x79 #define VAUX3_DEV_GRP 0x7A #define VAUX3_DEDICATED 0x7D +#define VMMC1_DEV_GRP 0x82 +#define VMMC1_DEDICATED 0x85 #define VPLL2_DEV_GRP 0x8E #define VPLL2_DEDICATED 0x91 #define VDAC_DEV_GRP 0x96 @@ -214,5 +217,6 @@ typedef struct gpio { #define VAUX3_VSEL_28 0x03 #define VPLL2_VSEL_18 0x05 #define VDAC_VSEL_18 0x03 +#define VMMC1_VSEL_30 0x02 #endif |