commit 97aff3389c0520304fe844d2369268313474e1ec
Author: Bjorn Helgaas <bhelgaas@google.com>
Date:   Mon Mar 9 21:42:54 2015 -0500

    sdhc

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index ad4d43eae99d..bcb48e618eed 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -21,6 +21,8 @@
 #include <linux/mmc/mmc.h>
 #include <linux/mmc/sd.h>
 
+#include <linux/delay.h>
+
 #include "core.h"
 #include "bus.h"
 #include "mmc_ops.h"
@@ -1222,6 +1224,7 @@ int mmc_attach_sd(struct mmc_host *host)
 	BUG_ON(!host);
 	WARN_ON(!host->claimed);
 
+	msleep(500);
 	err = mmc_send_app_op_cond(host, 0, &ocr);
 	if (err)
 		return err;
@@ -1236,6 +1239,7 @@ int mmc_attach_sd(struct mmc_host *host)
 	if (mmc_host_is_spi(host)) {
 		mmc_go_idle(host);
 
+		msleep(500);
 		err = mmc_spi_read_ocr(host, 0, &ocr);
 		if (err)
 			goto err;
@@ -1254,6 +1258,7 @@ int mmc_attach_sd(struct mmc_host *host)
 	/*
 	 * Detect and init the card.
 	 */
+	msleep(500);
 	err = mmc_sd_init_card(host, rocr, NULL);
 	if (err)
 		goto err;
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index 29eaff78238e..05c893228586 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -141,6 +141,7 @@ static irqreturn_t sdhci_pci_sd_cd(int irq, void *dev_id)
 	struct sdhci_pci_slot *slot = dev_id;
 	struct sdhci_host *host = slot->host;
 
+	dev_info(&slot->chip->pdev->dev, "%s\n", __func__);
 	mmc_detect_change(host->mmc, msecs_to_jiffies(200));
 	return IRQ_HANDLED;
 }
@@ -167,6 +168,7 @@ static void sdhci_pci_add_own_cd(struct sdhci_pci_slot *slot)
 	if (irq < 0)
 		goto out_free;
 
+	dev_info(&slot->chip->pdev->dev, "irq %d for card detect\n", irq);
 	err = request_irq(irq, sdhci_pci_sd_cd, IRQF_TRIGGER_RISING |
 			  IRQF_TRIGGER_FALLING, "sd_cd", slot);
 	if (err)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 0ad412a4876f..dcb5bc54fa82 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2687,6 +2687,7 @@ static irqreturn_t sdhci_thread_irq(int irq, void *dev_id)
 	spin_unlock_irqrestore(&host->lock, flags);
 
 	if (isr & (SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE)) {
+		pr_info("%s: IRQ, ISR %#x\n", mmc_hostname(host->mmc), isr);
 		sdhci_card_event(host->mmc);
 		mmc_detect_change(host->mmc, msecs_to_jiffies(200));
 	}
@@ -3428,6 +3429,7 @@ int sdhci_add_host(struct sdhci_host *host)
 
 	sdhci_init(host, 0);
 
+	pr_info("%s: requesting IRQ %d\n", mmc_hostname(mmc), host->irq);
 	ret = request_threaded_irq(host->irq, sdhci_irq, sdhci_thread_irq,
 				   IRQF_SHARED,	mmc_hostname(mmc), host);
 	if (ret) {