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

Commit 15d0023e authored by Adrian Hunter's avatar Adrian Hunter Committed by Sasha Levin
Browse files

mmc: sdhci-acpi: Add two host capabilities for Intel 



[ Upstream commit 9d65cb88e5979d43f47c899601353ca61973ba90 ]

Intel host controllers are capable of doing the bus
width test and of waiting while busy, so add the
capability flags.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent ee0fc86c

drivers/mmc/host/sdhci-acpi.c

+5 −2
Original line number Diff line number Diff line
@@ -180,7 +180,8 @@ static int sdhci_acpi_sd_probe_slot(struct platform_device *pdev, 
static const struct sdhci_acpi_slot sdhci_acpi_slot_int_emmc = {

	.chip    = &sdhci_acpi_chip_int,

	.caps    = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE |

		   MMC_CAP_HW_RESET | MMC_CAP_1_8V_DDR,

		   MMC_CAP_HW_RESET | MMC_CAP_1_8V_DDR |

		   MMC_CAP_BUS_WIDTH_TEST | MMC_CAP_WAIT_WHILE_BUSY,

	.caps2   = MMC_CAP2_HC_ERASE_SZ,

	.flags   = SDHCI_ACPI_RUNTIME_PM,

	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN | SDHCI_QUIRK2_STOP_WITH_TC,
@@ -190,7 +191,8 @@ static const struct sdhci_acpi_slot sdhci_acpi_slot_int_emmc = { 
static const struct sdhci_acpi_slot sdhci_acpi_slot_int_sdio = {

	.quirks  = SDHCI_QUIRK_BROKEN_CARD_DETECTION,

	.quirks2 = SDHCI_QUIRK2_HOST_OFF_CARD_ON,

	.caps    = MMC_CAP_NONREMOVABLE | MMC_CAP_POWER_OFF_CARD,

	.caps    = MMC_CAP_NONREMOVABLE | MMC_CAP_POWER_OFF_CARD |

		   MMC_CAP_BUS_WIDTH_TEST | MMC_CAP_WAIT_WHILE_BUSY,

	.flags   = SDHCI_ACPI_RUNTIME_PM,

	.pm_caps = MMC_PM_KEEP_POWER,

	.probe_slot	= sdhci_acpi_sdio_probe_slot,
@@ -201,6 +203,7 @@ static const struct sdhci_acpi_slot sdhci_acpi_slot_int_sd = { 
		   SDHCI_ACPI_RUNTIME_PM,

	.quirks2 = SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON |

		   SDHCI_QUIRK2_STOP_WITH_TC,

	.caps    = MMC_CAP_BUS_WIDTH_TEST | MMC_CAP_WAIT_WHILE_BUSY,

	.probe_slot	= sdhci_acpi_sd_probe_slot,

};