mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 15:47:36 +00:00
mmc: sdhci: sdhci-pci-o2micro: Correctly set bus width when tuning
The O2Micro controller only supports tuning at 4-bits. So the host driver
needs to change the bus width while tuning and then set it back when done.
There was a bug in the original implementation in that mmc->ios.bus_width
also wasn't updated. Thus setting the incorrect blocksize in
sdhci_send_tuning which results in a tuning failure.
Signed-off-by: Raul E Rangel <rrangel@chromium.org>
Fixes: 0086fc217d
("mmc: sdhci: Add support for O2 hardware tuning")
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
parent
65dade6044
commit
0f7b79a44e
1 changed files with 4 additions and 1 deletions
|
@ -115,6 +115,7 @@ static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode)
|
||||||
*/
|
*/
|
||||||
if (mmc->ios.bus_width == MMC_BUS_WIDTH_8) {
|
if (mmc->ios.bus_width == MMC_BUS_WIDTH_8) {
|
||||||
current_bus_width = mmc->ios.bus_width;
|
current_bus_width = mmc->ios.bus_width;
|
||||||
|
mmc->ios.bus_width = MMC_BUS_WIDTH_4;
|
||||||
sdhci_set_bus_width(host, MMC_BUS_WIDTH_4);
|
sdhci_set_bus_width(host, MMC_BUS_WIDTH_4);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -126,8 +127,10 @@ static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode)
|
||||||
|
|
||||||
sdhci_end_tuning(host);
|
sdhci_end_tuning(host);
|
||||||
|
|
||||||
if (current_bus_width == MMC_BUS_WIDTH_8)
|
if (current_bus_width == MMC_BUS_WIDTH_8) {
|
||||||
|
mmc->ios.bus_width = MMC_BUS_WIDTH_8;
|
||||||
sdhci_set_bus_width(host, current_bus_width);
|
sdhci_set_bus_width(host, current_bus_width);
|
||||||
|
}
|
||||||
|
|
||||||
host->flags &= ~SDHCI_HS400_TUNING;
|
host->flags &= ~SDHCI_HS400_TUNING;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue