diff options
| author | Tom Rini <trini@konsulko.com> | 2015-05-05 07:00:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-05-05 07:00:38 -0400 |
| commit | ff7e9cfc338ecd6db5ed7d6ff8fb7a2889b0131c (patch) | |
| tree | d127b051d0cb5ad8571fc176056600488576bdb5 /include | |
| parent | 3f2f1a00394eb7ce7176f9d0930e40e55ba2c79c (diff) | |
| parent | 33fe2fb8df01647f97a7bce96a1c7781a7f6d253 (diff) | |
| download | talos-obmc-uboot-ff7e9cfc338ecd6db5ed7d6ff8fb7a2889b0131c.tar.gz talos-obmc-uboot-ff7e9cfc338ecd6db5ed7d6ff8fb7a2889b0131c.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
Diffstat (limited to 'include')
| -rw-r--r-- | include/mmc.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/mmc.h b/include/mmc.h index 2ad0f191c3..dd98b3b8ac 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -55,13 +55,12 @@ #define MMC_MODE_4BIT (1 << 2) #define MMC_MODE_8BIT (1 << 3) #define MMC_MODE_SPI (1 << 4) -#define MMC_MODE_HC (1 << 5) -#define MMC_MODE_DDR_52MHz (1 << 6) +#define MMC_MODE_DDR_52MHz (1 << 5) #define SD_DATA_4BIT 0x00040000 #define IS_SD(x) ((x)->version & SD_VERSION_SD) -#define IS_MMC(x) ((x)->version & SD_VERSION_MMC) +#define IS_MMC(x) ((x)->version & MMC_VERSION_MMC) #define MMC_DATA_READ 1 #define MMC_DATA_WRITE 2 @@ -70,8 +69,7 @@ #define UNUSABLE_ERR -17 /* Unusable Card */ #define COMM_ERR -18 /* Communications Error */ #define TIMEOUT -19 -#define IN_PROGRESS -20 /* operation is in progress */ -#define SWITCH_ERR -21 /* Card reports failure to switch mode */ +#define SWITCH_ERR -20 /* Card reports failure to switch mode */ #define MMC_CMD_GO_IDLE_STATE 0 #define MMC_CMD_SEND_OP_COND 1 @@ -356,7 +354,6 @@ struct mmc { char op_cond_pending; /* 1 if we are waiting on an op_cond command */ char init_in_progress; /* 1 if we have done mmc_start_init() */ char preinit; /* start init as early as possible */ - uint op_cond_response; /* the response byte from the last op_cond */ int ddr_mode; }; |
