Skip to content

Commit 49baa01

Browse files
dsdstorulf
authored andcommitted
Revert "mmc: sdhci: Remove unneeded quirk2 flag of O2 SD host controller"
This reverts commit 414126f. This commit broke eMMC storage access on a new consumer MiniPC based on AMD SoC, which has eMMC connected to: 02:00.0 SD Host controller: O2 Micro, Inc. Device 8620 (rev 01) (prog-if 01) Subsystem: O2 Micro, Inc. Device 0002 During probe, several errors are seen including: mmc1: Got data interrupt 0x02000000 even though no data operation was in progress. mmc1: Timeout waiting for hardware interrupt. mmc1: error -110 whilst initialising MMC card Reverting this commit allows the eMMC storage to be detected & usable again. Signed-off-by: Daniel Drake <[email protected]> Fixes: 414126f ("mmc: sdhci: Remove unneeded quirk2 flag of O2 SD host controller") Cc: [email protected] # v5.1+ Signed-off-by: Ulf Hansson <[email protected]>
1 parent aea64b5 commit 49baa01

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/mmc/host/sdhci-pci-o2micro.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,6 @@ int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot)
432432
mmc_hostname(host->mmc));
433433
host->flags &= ~SDHCI_SIGNALING_330;
434434
host->flags |= SDHCI_SIGNALING_180;
435-
host->quirks2 |= SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD;
436435
host->mmc->caps2 |= MMC_CAP2_NO_SD;
437436
host->mmc->caps2 |= MMC_CAP2_NO_SDIO;
438437
pci_write_config_dword(chip->pdev,
@@ -682,6 +681,7 @@ static const struct sdhci_ops sdhci_pci_o2_ops = {
682681
const struct sdhci_pci_fixes sdhci_o2 = {
683682
.probe = sdhci_pci_o2_probe,
684683
.quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
684+
.quirks2 = SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD,
685685
.probe_slot = sdhci_pci_o2_probe_slot,
686686
#ifdef CONFIG_PM_SLEEP
687687
.resume = sdhci_pci_o2_resume,

0 commit comments

Comments
 (0)