diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-06-04 10:56:09 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-06-04 10:56:09 +0200 |
| commit | 3bc8556f9b24af60dba2b55a0abb1182dff45ecc (patch) | |
| tree | a6333aa494f842120c69724386b3823affd177e7 /include | |
| parent | dfcd7f21607fd847236b04bb1a8d59a7c10ab99c (diff) | |
| parent | 4e3d89ba948eef801ffd46ef862cdede5b3f8320 (diff) | |
| download | u-boot-imx-3bc8556f9b24af60dba2b55a0abb1182dff45ecc.zip u-boot-imx-3bc8556f9b24af60dba2b55a0abb1182dff45ecc.tar.gz u-boot-imx-3bc8556f9b24af60dba2b55a0abb1182dff45ecc.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
Diffstat (limited to 'include')
| -rw-r--r-- | include/mmc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/mmc.h b/include/mmc.h index b9b27ba..229d494 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -91,7 +91,7 @@ #define MMC_HS_TIMING 0x00000100 #define MMC_HS_52MHZ 0x2 -#define OCR_BUSY 0x80 +#define OCR_BUSY 0x80000000 #define OCR_HCS 0x40000000 #define MMC_VDD_165_195 0x00000080 /* VDD voltage 1.65 - 1.95 */ @@ -223,7 +223,7 @@ struct mmc_cmd { ushort cmdidx; uint resp_type; uint cmdarg; - char response[18]; + uint response[4]; uint flags; }; @@ -253,7 +253,7 @@ struct mmc { uint ocr; uint scr[2]; uint csd[4]; - char cid[16]; + uint cid[4]; ushort rca; uint tran_speed; uint read_bl_len; |