summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2023-03-24 18:48:06 +0300
committerUlf Hansson <ulf.hansson@linaro.org>2023-03-24 18:48:06 +0300
commitc7461f3e689f13d4899a754b0017082af5f324cc (patch)
tree6e7a028a8e85947886e55952c3cba6bb3e4d59e6 /drivers/mmc
parent0dd8316037a2a6d85b2be208bef9991de7b42170 (diff)
parent2265098fd6a6272fde3fd1be5761f2f5895bd99a (diff)
downloadlinux-c7461f3e689f13d4899a754b0017082af5f324cc.tar.xz
mmc: Merge branch fixes into next
Merge the mmc fixes for v6.3-rc[n] into the next branch, to allow them to get tested together with the new mmc changes that are targeted for v6.4. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci_am654.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c
index 89953093e20c..672d37ea98d0 100644
--- a/drivers/mmc/host/sdhci_am654.c
+++ b/drivers/mmc/host/sdhci_am654.c
@@ -351,8 +351,6 @@ static void sdhci_am654_write_b(struct sdhci_host *host, u8 val, int reg)
*/
case MMC_TIMING_SD_HS:
case MMC_TIMING_MMC_HS:
- case MMC_TIMING_UHS_SDR12:
- case MMC_TIMING_UHS_SDR25:
val &= ~SDHCI_CTRL_HISPD;
}
}