From 7305899ce0d7c0603189c0c3353fb385b6183515 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 5 Dec 2023 13:34:00 +0900 Subject: [PATCH] drop queue-5.4/mmc-sdhci-sprd-fix-vqmmc-not-shutting-down-after-the-card-was-pulled.patch --- ...tting-down-after-the-card-was-pulled.patch | 88 ------------------- queue-5.4/series | 1 - 2 files changed, 89 deletions(-) delete mode 100644 queue-5.4/mmc-sdhci-sprd-fix-vqmmc-not-shutting-down-after-the-card-was-pulled.patch diff --git a/queue-5.4/mmc-sdhci-sprd-fix-vqmmc-not-shutting-down-after-the-card-was-pulled.patch b/queue-5.4/mmc-sdhci-sprd-fix-vqmmc-not-shutting-down-after-the-card-was-pulled.patch deleted file mode 100644 index bfd1f117c11..00000000000 --- a/queue-5.4/mmc-sdhci-sprd-fix-vqmmc-not-shutting-down-after-the-card-was-pulled.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 477865af60b2117ceaa1d558e03559108c15c78c Mon Sep 17 00:00:00 2001 -From: Wenchao Chen -Date: Wed, 15 Nov 2023 16:34:06 +0800 -Subject: mmc: sdhci-sprd: Fix vqmmc not shutting down after the card was pulled - -From: Wenchao Chen - -commit 477865af60b2117ceaa1d558e03559108c15c78c upstream. - -With cat regulator_summary, we found that vqmmc was not shutting -down after the card was pulled. - -cat /sys/kernel/debug/regulator/regulator_summary -1.before fix -1)Insert SD card - vddsdio 1 1 0 unknown 3500mV 0mA 1200mV 3750mV - 71100000.mmc-vqmmc 1 0mA 3500mV 3600mV - -2)Pull out the SD card - vddsdio 1 1 0 unknown 3500mV 0mA 1200mV 3750mV - 71100000.mmc-vqmmc 1 0mA 3500mV 3600mV - -2.after fix -1)Insert SD cardt - vddsdio 1 1 0 unknown 3500mV 0mA 1200mV 3750mV - 71100000.mmc-vqmmc 1 0mA 3500mV 3600mV - -2)Pull out the SD card - vddsdio 0 1 0 unknown 3500mV 0mA 1200mV 3750mV - 71100000.mmc-vqmmc 0 0mA 3500mV 3600mV - -Fixes: fb8bd90f83c4 ("mmc: sdhci-sprd: Add Spreadtrum's initial host controller") -Signed-off-by: Wenchao Chen -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/20231115083406.7368-1-wenchao.chen@unisoc.com -Signed-off-by: Ulf Hansson -Signed-off-by: Greg Kroah-Hartman ---- - drivers/mmc/host/sdhci-sprd.c | 25 +++++++++++++++++++++++++ - 1 file changed, 25 insertions(+) - ---- a/drivers/mmc/host/sdhci-sprd.c -+++ b/drivers/mmc/host/sdhci-sprd.c -@@ -381,12 +381,33 @@ static unsigned int sdhci_sprd_get_ro(st - return 0; - } - -+static void sdhci_sprd_set_power(struct sdhci_host *host, unsigned char mode, -+ unsigned short vdd) -+{ -+ struct mmc_host *mmc = host->mmc; -+ -+ switch (mode) { -+ case MMC_POWER_OFF: -+ mmc_regulator_set_ocr(host->mmc, mmc->supply.vmmc, 0); -+ -+ mmc_regulator_disable_vqmmc(mmc); -+ break; -+ case MMC_POWER_ON: -+ mmc_regulator_enable_vqmmc(mmc); -+ break; -+ case MMC_POWER_UP: -+ mmc_regulator_set_ocr(host->mmc, mmc->supply.vmmc, vdd); -+ break; -+ } -+} -+ - static struct sdhci_ops sdhci_sprd_ops = { - .read_l = sdhci_sprd_readl, - .write_l = sdhci_sprd_writel, - .write_w = sdhci_sprd_writew, - .write_b = sdhci_sprd_writeb, - .set_clock = sdhci_sprd_set_clock, -+ .set_power = sdhci_sprd_set_power, - .get_max_clock = sdhci_sprd_get_max_clock, - .get_min_clock = sdhci_sprd_get_min_clock, - .set_bus_width = sdhci_set_bus_width, -@@ -630,6 +651,10 @@ static int sdhci_sprd_probe(struct platf - host->caps1 &= ~(SDHCI_SUPPORT_SDR50 | SDHCI_SUPPORT_SDR104 | - SDHCI_SUPPORT_DDR50); - -+ ret = mmc_regulator_get_supply(host->mmc); -+ if (ret) -+ goto pm_runtime_disable; -+ - ret = sdhci_setup_host(host); - if (ret) - goto pm_runtime_disable; diff --git a/queue-5.4/series b/queue-5.4/series index 8e0a4142c30..748b0c91ff7 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -51,7 +51,6 @@ io_uring-fix-off-by-one-bvec-index.patch perf-inject-fix-gen_elf_text_offset-for-jit.patch pinctrl-avoid-reload-of-p-state-in-list-iteration.patch firewire-core-fix-possible-memory-leak-in-create_units.patch -mmc-sdhci-sprd-fix-vqmmc-not-shutting-down-after-the-card-was-pulled.patch mmc-block-do-not-lose-cache-flush-during-cqe-error-recovery.patch alsa-hda-disable-power-save-on-kontron-singlepc.patch alsa-hda-realtek-headset-mic-vref-to-100.patch -- 2.47.3