diff options
| author | Dimitris Papastamos <dimitris.papastamos@arm.com> | 2018-09-05 12:20:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-05 12:20:10 +0100 |
| commit | 36044baf08a9f816a8a062a8a50ede12a816a6dd (patch) | |
| tree | a3979f9fb251e81ad990c1bfb6a00b33a686aa51 /drivers/mmc/mmc.c | |
| parent | 05ca725465276726cb45f8c97afef6f066238561 (diff) | |
| parent | 622e890d6080d971bc5a60965764dc78e80c1b36 (diff) | |
Merge pull request #1515 from bryanodonoghue/atf-master+linaro-warp7-squash-v4
Atf master+linaro warp7 squash v4
Diffstat (limited to 'drivers/mmc/mmc.c')
| -rw-r--r-- | drivers/mmc/mmc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index bf87612d..73287aef 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -109,7 +109,7 @@ static int mmc_set_ext_csd(unsigned int ext_cmd, unsigned int value) ret = mmc_send_cmd(MMC_CMD(6), EXTCSD_WRITE_BYTES | EXTCSD_CMD(ext_cmd) | EXTCSD_VALUE(value) | EXTCSD_CMD_SET_NORMAL, - 0, NULL); + MMC_RESPONSE_R1B, NULL); if (ret != 0) { return ret; } @@ -333,7 +333,7 @@ static int sd_send_op_cond(void) } /* ACMD41: SD_SEND_OP_COND */ - ret = mmc_send_cmd(MMC_ACMD(41), OCR_HCS, MMC_RESPONSE_R(3), + ret = mmc_send_cmd(MMC_ACMD(41), OCR_HCS, MMC_RESPONSE_R3, &resp_data[0]); if (ret != 0) { return ret; @@ -384,7 +384,7 @@ static int mmc_send_op_cond(void) for (n = 0; n < SEND_OP_COND_MAX_RETRIES; n++) { ret = mmc_send_cmd(MMC_CMD(1), OCR_SECTOR_MODE | OCR_VDD_MIN_2V7 | OCR_VDD_MIN_1V7, - MMC_RESPONSE_R(3), &resp_data[0]); + MMC_RESPONSE_R3, &resp_data[0]); if (ret != 0) { return ret; } @@ -539,7 +539,7 @@ size_t mmc_read_blocks(int lba, uintptr_t buf, size_t size) } while ((ret != MMC_STATE_TRAN) && (ret != MMC_STATE_DATA)); if (!is_cmd23_enabled() && (size > MMC_BLOCK_SIZE)) { - ret = mmc_send_cmd(MMC_CMD(12), 0, 0, NULL); + ret = mmc_send_cmd(MMC_CMD(12), 0, MMC_RESPONSE_R1B, NULL); if (ret != 0) { return 0; } @@ -606,7 +606,7 @@ size_t mmc_write_blocks(int lba, const uintptr_t buf, size_t size) } while ((ret != MMC_STATE_TRAN) && (ret != MMC_STATE_RCV)); if (!is_cmd23_enabled() && (size > MMC_BLOCK_SIZE)) { - ret = mmc_send_cmd(MMC_CMD(12), 0, 0, NULL); + ret = mmc_send_cmd(MMC_CMD(12), 0, MMC_RESPONSE_R1B, NULL); if (ret != 0) { return 0; } |