Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5eaa7476 authored by Al Cooper's avatar Al Cooper Committed by Ulf Hansson
Browse files

mmc: sdhci: Allow CAPS check for SDHCI_CAN_64BIT to use overridden caps 



sdhci_add_host() allows the Host Controller Capability registers
to be supplied by the calling driver by using
SDHCI_QUIRK_MISSING_CAPS, but the check for the Capabilities bit
SDHCI_CAN_64BIT doesn't use the applied value and instead reads
the Host register directly. This change uses the supplied "caps"
register instead of reading the host register.

This change will allow a calling driver to simply clear the
SDHCI_CAN_64BIT bit in "caps" to handle some cases of
SDHCI_QUIRK2_BROKEN_64_BIT_DMA.

Signed-off-by: default avatarAl Cooper <alcooperx@gmail.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 5d9460d7

drivers/mmc/host/sdhci.c

+1 −1
Original line number Diff line number Diff line
@@ -2928,7 +2928,7 @@ int sdhci_add_host(struct sdhci_host *host) 
	 * SDHCI_QUIRK2_BROKEN_64_BIT_DMA must be left to the drivers to

	 * implement.

	 */

	if (sdhci_readl(host, SDHCI_CAPABILITIES) & SDHCI_CAN_64BIT)

	if (caps[0] & SDHCI_CAN_64BIT)

		host->flags |= SDHCI_USE_64_BIT_DMA;



	if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) {