tree 31e0f2dce7bd7ee700468a8b4bda8553ccaceb1d
parent 77e2ff08925c7ec7267dc87c27eda2e62d585b57
author Shawn Guo <shawn.guo@linaro.org> 1355210622 +0800
committer Chris Ball <cjb@laptop.org> 1360605083 -0500

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>