From 3b29ed3227539299a90acfbbdd8b90f352eae1ce Mon Sep 17 00:00:00 2001 From: "Bao D. Nguyen" Date: Wed, 8 Apr 2020 22:36:36 -0700 Subject: [PATCH] Revert "mmc: sdhci-msm: Avoid enable SD card power if card is removed" This reverts commit 82fc4015597a54a3071b063bd670db3afd57dbd1. When there is no SD card inserted, this change causes the SD card driver to wait for the mmc power IRQ that never comes. As a result, the boot up time may be longer. Revert this change and fix the original issue properly. Change-Id: I22b53109c10c3f533ebe1f19f9bed9301810fb77 Signed-off-by: Bao D. Nguyen --- drivers/mmc/host/sdhci-msm.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index b0a4e84f46e0..9d86fe96d303 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -2058,7 +2058,6 @@ static void sdhci_msm_handle_pwr_irq(struct sdhci_host *host, int irq) u32 config; const struct sdhci_msm_offset *msm_offset = msm_host->offset; int ret = 0; - struct mmc_host *mmc = host->mmc; irq_status = msm_host_readl(msm_host, host, msm_offset->core_pwrctl_status); @@ -2089,12 +2088,6 @@ static void sdhci_msm_handle_pwr_irq(struct sdhci_host *host, int irq) udelay(10); } - if (mmc->ops->get_cd && !mmc->ops->get_cd(mmc) && - irq_status & (CORE_PWRCTL_BUS_ON | CORE_PWRCTL_IO_HIGH | - CORE_PWRCTL_IO_LOW)) { - return; - } - /* Handle BUS ON/OFF*/ if (irq_status & CORE_PWRCTL_BUS_ON) { ret = sdhci_msm_setup_vreg(msm_host->pdata, true, false);