Some SoC is used the broken card-detection.
And it should be also used the "non-removable".
Even if card is "non-removable", it didn't always use the cd-gpio.
If it's used only broken-cd, then card-detect interrupt is polling.
Signed-off-by: Jaehoon Chung <jh80.chung@xxxxxxxxxxx>
---
drivers/mmc/core/core.c | 4 ++--
drivers/mmc/core/host.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 098374b..df732aa 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2460,8 +2460,8 @@ void mmc_rescan(struct work_struct *work)
*/
mmc_bus_put(host);
- if (!(host->caps & MMC_CAP_NONREMOVABLE) && host->ops->get_cd &&
- host->ops->get_cd(host) == 0) {
+ if (host->ops->get_cd && host->ops->get_cd(host) == 0 &&
+ !(host->caps & MMC_CAP_NONREMOVABLE)) {
mmc_claim_host(host);
mmc_power_off(host);
mmc_release_host(host);
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 4b81c93..52a64fe 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -356,6 +356,9 @@ int mmc_of_parse(struct mmc_host *host)
* configuration is performed.
*/
+ if (of_find_property(np, "broken-cd", &len))
+ host->caps |= MMC_CAP_NEEDS_POLL;
+
/* Parse Card Detection */
if (of_find_property(np, "non-removable", &len)) {
host->caps |= MMC_CAP_NONREMOVABLE;
@@ -364,9 +367,6 @@ int mmc_of_parse(struct mmc_host *host)
explicit_inv_cd = of_property_read_bool(np, "cd-inverted");
- if (of_find_property(np, "broken-cd", &len))
- host->caps |= MMC_CAP_NEEDS_POLL;
-
gpio = of_get_named_gpio_flags(np, "cd-gpios", 0, &flags);
if (gpio == -EPROBE_DEFER)
return gpio;
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
