Commit c5b1c6dc authored by Jeremy Linton's avatar Jeremy Linton Committed by Ulf Hansson
Browse files

mmc: sdhci: Update firmware interface API 



The device_* calls were added a few years ago to abstract
DT/ACPI/fwnode firmware interfaces. Lets convert the two
sdhci caps fields to use the generic calls rather than the OF
specific ones. This has the side effect of allowing
ACPI based devices to quirk themselves when the caps field
is broken.

Signed-off-by: default avatarJeremy Linton <jeremy.linton@arm.com>
Link: https://lore.kernel.org/r/20201120233831.447365-1-jeremy.linton@arm.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 2fd8a078

drivers/mmc/host/sdhci.c

+4 −4
Original line number Diff line number Diff line
@@ -3994,10 +3994,10 @@ void __sdhci_read_caps(struct sdhci_host *host, const u16 *ver, 
	if (host->v4_mode)

		sdhci_do_enable_v4_mode(host);



	of_property_read_u64(mmc_dev(host->mmc)->of_node,

			     "sdhci-caps-mask", &dt_caps_mask);

	of_property_read_u64(mmc_dev(host->mmc)->of_node,

			     "sdhci-caps", &dt_caps);

	device_property_read_u64_array(mmc_dev(host->mmc),

				       "sdhci-caps-mask", &dt_caps_mask, 1);

	device_property_read_u64_array(mmc_dev(host->mmc),

				       "sdhci-caps", &dt_caps, 1);



	v = ver ? *ver : sdhci_readw(host, SDHCI_HOST_VERSION);

	host->version = (v & SDHCI_SPEC_VER_MASK) >> SDHCI_SPEC_VER_SHIFT;

CRA Git | Maintained and supported by SUSTech CRA and CCSE