From: Dmitry Shmidt Date: Thu, 24 Jun 2010 02:10:42 +0000 (-0700) Subject: [ARM] tegra: mmc: Fix built-in device detect delay X-Git-Tag: firefly_0821_release~9834^2~825 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a7ba815324f79c2bfd69492a852db71e5472197a;p=firefly-linux-kernel-4.4.55.git [ARM] tegra: mmc: Fix built-in device detect delay Signed-off-by: Dmitry Shmidt --- diff --git a/arch/arm/include/asm/mach/mmc.h b/arch/arm/include/asm/mach/mmc.h index 8948dec26067..f8d391ad9203 100644 --- a/arch/arm/include/asm/mach/mmc.h +++ b/arch/arm/include/asm/mach/mmc.h @@ -17,6 +17,7 @@ struct embedded_sdio_data { struct mmc_platform_data { unsigned int ocr_mask; /* available voltages */ + int built_in; /* built-in device flag */ u32 (*translate_vdd)(struct device *, unsigned int); unsigned int (*status)(struct device *); struct embedded_sdio_data *embedded_sdio; diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index 6d56e21bb5a5..2a73fd3e8570 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -65,7 +65,7 @@ static void sdhci_status_notify_cb(int card_present, void *dev_id) if (status ^ oldstat) { pr_debug("%s: Slot status change detected (%d -> %d)\n", mmc_hostname(host->mmc), oldstat, status); - if (status) + if (status && !tegra_host->plat->mmc_data.built_in) mmc_detect_change(host->mmc, (5 * HZ) / 2); else mmc_detect_change(host->mmc, 0);