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

Commit bec9d4e5 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Chris Ball
Browse files

mmc: sdhci: Test cd-gpio instead of SDHCI presence when probing 



Previously to this patch, an SDHCI platform that uses a GPIO for
card detection instead of the internal SDHCI_CARD_PRESENT bit on
the presence register would fail to detect a new card.

Some drivers worked around this in various ways: esdhc-imx defines
an IO accessor to fake the presence bit being true, s3c turns on
polling (which stops the SDHCI driver from checking the bit) after
a card's inserted.  But none of this should be necessary; the real
fix is to check whether we're using a GPIO and avoid relying on
the presence bit if so, as this patch implements.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 5413da81

drivers/mmc/host/sdhci.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/mmc/mmc.h>

#include <linux/mmc/mmc.h>

#include <linux/mmc/host.h>

#include <linux/mmc/host.h>

#include <linux/mmc/card.h>

#include <linux/mmc/card.h>

#include <linux/mmc/slot-gpio.h>





#include "sdhci.h"

#include "sdhci.h"
@@ -1293,6 +1294,13 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) 
		present = sdhci_readl(host, SDHCI_PRESENT_STATE) &

		present = sdhci_readl(host, SDHCI_PRESENT_STATE) &

				SDHCI_CARD_PRESENT;

				SDHCI_CARD_PRESENT;





	/* If we're using a cd-gpio, testing the presence bit might fail. */

	if (!present) {

		int ret = mmc_gpio_get_cd(host->mmc);

		if (ret > 0)

			present = true;

	}



	if (!present || host->flags & SDHCI_DEVICE_DEAD) {

	if (!present || host->flags & SDHCI_DEVICE_DEAD) {

		host->mrq->cmd->error = -ENOMEDIUM;

		host->mrq->cmd->error = -ENOMEDIUM;

		tasklet_schedule(&host->finish_tasklet);

		tasklet_schedule(&host->finish_tasklet);