diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2018-09-28 14:21:01 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2018-09-28 14:37:09 +0800 |
| commit | a2a69bc89fb7f4badca445e2fe94d60f425de65e (patch) | |
| tree | d09f9ac03bdcfe9093dcb5439c805e8b43c2fd8d /drivers/mmc/mmc.c | |
| parent | 9068257ea7e0242214f9e833410d9b3fc8bcbe45 (diff) | |
| download | arm-trusted-firmware-a2a69bc89fb7f4badca445e2fe94d60f425de65e.tar.gz | |
drivers: mmc: Fix R2 response type definition
The Poplar is broken on eMMC initialization because of commit
2a82a9c95f6c ("drivers: emmc: dw_mmc: Add response flag into response ID
definition"). It changes the driver behavior on response type handling
in dw_send_cmd(), because MMC_RESPONSE_R(2) and MMC_RESPONSE_R2 are
different things. MMC core is still sending the former while we already
changed to check the latter in dw_mmc driver.
This patch fixes R2 response type in MMC core code. It's the same
thing as what commit 94522ff7f6d2 ("drivers: mmc: Fix R3 response type
definition") does for R3 response.
With this fix, Poplar is back to work.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'drivers/mmc/mmc.c')
| -rw-r--r-- | drivers/mmc/mmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 73287aef8..3e722e3b6 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -427,7 +427,7 @@ static int mmc_enumerate(unsigned int clk, unsigned int bus_width) } /* CMD2: Card Identification */ - ret = mmc_send_cmd(MMC_CMD(2), 0, MMC_RESPONSE_R(2), NULL); + ret = mmc_send_cmd(MMC_CMD(2), 0, MMC_RESPONSE_R2, NULL); if (ret != 0) { return ret; } @@ -452,7 +452,7 @@ static int mmc_enumerate(unsigned int clk, unsigned int bus_width) /* CMD9: CSD Register */ ret = mmc_send_cmd(MMC_CMD(9), rca << RCA_SHIFT_OFFSET, - MMC_RESPONSE_R(2), &resp_data[0]); + MMC_RESPONSE_R2, &resp_data[0]); if (ret != 0) { return ret; } |