Commit 1a6436f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc 

Pull MMC host fix from Ulf Hansson:

 - sdhci-iproc: Fix clock error for ACPI rpi's

* tag 'mmc-v5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  Revert "mmc: sdhci-iproc: Set SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN on BCM2711"
parents 94606b89 885814a9

drivers/mmc/host/sdhci-iproc.c

+1 −2
Original line number Diff line number Diff line
@@ -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,

};