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

Commit c844a46f authored by Kevin Liu's avatar Kevin Liu Committed by Chris Ball
Browse files

mmc: sdhci-pxav3: remove cd-broken quirk for permanently present card 



Flag PXA_FLAG_CARD_PERMANENT is set in sdhci_pxa_platdata flags to
indicate that the card is always wired to host, like on-chip emmc,
which is permanently present and don't need detection.

So only MMC_CAP_NONREMOVABLE should be set for this case. But current
code also sets SDHCI_QUIRK_BROKEN_CARD_DETECTION, which doesn't make
sense.

Signed-off-by: default avatarKevin Liu <kliu5@marvell.com>
Acked-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 73b7afb9

drivers/mmc/host/sdhci-pxav3.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -268,11 +268,9 @@ static int sdhci_pxav3_probe(struct platform_device *pdev) 
		pdata = pxav3_get_mmc_pdata(dev);

		pdata = pxav3_get_mmc_pdata(dev);





	if (pdata) {

	if (pdata) {

		if (pdata->flags & PXA_FLAG_CARD_PERMANENT) {

		/* on-chip device */

		/* on-chip device */

			host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION;

		if (pdata->flags & PXA_FLAG_CARD_PERMANENT)

			host->mmc->caps |= MMC_CAP_NONREMOVABLE;

			host->mmc->caps |= MMC_CAP_NONREMOVABLE;

		}





		/* If slot design supports 8 bit data, indicate this to MMC. */

		/* If slot design supports 8 bit data, indicate this to MMC. */

		if (pdata->flags & PXA_FLAG_SD_8_BIT_CAPABLE_SLOT)

		if (pdata->flags & PXA_FLAG_SD_8_BIT_CAPABLE_SLOT)