diff options
| author |   Ulf Hansson <ulf.hansson@linaro.org> | 2021-08-27 16:35:55 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2021-08-27 16:35:55 +0200 |
| commit | a75c956162978097c0a60d95971c97ae486a68d7 (patch) | |
| tree | cb1821c4f50bc3e0db6a1da688529c4435e074fe /drivers/mmc | |
| parent | mmc: queue: Remove unused parameters(request_queue) (diff) | |
| parent | Revert "mmc: sdhci-iproc: Set SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN on BCM2711" (diff) | |
| download | linux-dev-a75c956162978097c0a60d95971c97ae486a68d7.tar.xz linux-dev-a75c956162978097c0a60d95971c97ae486a68d7.zip | |
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci-iproc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c index e7565c671998..032bf852397f 100644 --- a/drivers/mmc/host/sdhci-iproc.c +++ b/drivers/mmc/host/sdhci-iproc.c @@ -295,8 +295,7 @@ static const struct sdhci_ops sdhci_iproc_bcm2711_ops = { }; static const struct sdhci_pltfm_data sdhci_bcm2711_pltfm_data = { - .quirks = SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 | - SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN, + .quirks = SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12, .ops = &sdhci_iproc_bcm2711_ops, }; |