mmc: sdhci: query card presence from cd-gpio before asking SDHCI
authorShawn Guo <shawn.guo@linaro.org>
Tue, 11 Dec 2012 07:23:42 +0000 (15:23 +0800)
committerChris Ball <cjb@laptop.org>
Mon, 28 Jan 2013 11:51:31 +0000 (06:51 -0500)
commit96272c84393330341f3778ace53c8ab4cbd8ddfd
treefb52e21d5250b2387294d04bc5844463f3c74300
parent033631b715491522c239185adcbfe8b20659868f
mmc: sdhci: query card presence from cd-gpio before asking SDHCI

Call mmc_gpio_get_cd() to query card presence from cd-gpio before
asking SDHCI.  The rationale behind this change is that flag
SDHCI_QUIRK_BROKEN_CARD_DETECTION is designed for SDHCI controller to
tell that SDHCI_PRESENT_STATE is broken, and it should be used for this
case only.  So when cd-gpio is being used, the controller should set
the flag to tell that SDHCI_PRESENT_STATE is not available.

However, the existing code will skip checking cd-gpio as long as flag
SDHCI_QUIRK_BROKEN_CARD_DETECTION is set.  Change the querying order
between cd-gpio and SDHCI to support the rationale above.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/sdhci.c