41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From b1ce5fb5a80db8945c9496f8ad9a74280d31ecf8 Mon Sep 17 00:00:00 2001
|
|
From: Lionel Vitte <lionel.vitte@st.com>
|
|
Date: Thu, 14 Oct 2021 16:51:47 +0200
|
|
Subject: [PATCH 12/23] ARM 5.10.61-stm32mp1-r2 MMC
|
|
|
|
---
|
|
drivers/mmc/core/mmc_test.c | 2 +-
|
|
drivers/mmc/host/mmci.c | 3 ---
|
|
2 files changed, 1 insertion(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/mmc/core/mmc_test.c b/drivers/mmc/core/mmc_test.c
|
|
index 152e7525e..b1f0d04f9 100644
|
|
--- a/drivers/mmc/core/mmc_test.c
|
|
+++ b/drivers/mmc/core/mmc_test.c
|
|
@@ -2124,7 +2124,7 @@ static int mmc_test_rw_multiple(struct mmc_test_card *test,
|
|
if (mmc_can_erase(test->card) &&
|
|
tdata->prepare & MMC_TEST_PREP_ERASE) {
|
|
ret = mmc_erase(test->card, dev_addr,
|
|
- size / 512, MMC_SECURE_ERASE_ARG);
|
|
+ size / 512, test->card->erase_arg);
|
|
if (ret)
|
|
ret = mmc_erase(test->card, dev_addr,
|
|
size / 512, MMC_ERASE_ARG);
|
|
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
|
|
index 9bde0def1..fa6d85190 100644
|
|
--- a/drivers/mmc/host/mmci.c
|
|
+++ b/drivers/mmc/host/mmci.c
|
|
@@ -2104,9 +2104,6 @@ static int mmci_probe(struct amba_device *dev,
|
|
host->stop_abort.arg = 0;
|
|
host->stop_abort.flags = MMC_RSP_R1B | MMC_CMD_AC;
|
|
|
|
- /* We support these PM capabilities. */
|
|
- mmc->pm_caps |= MMC_PM_KEEP_POWER;
|
|
-
|
|
/*
|
|
* We can do SGIO
|
|
*/
|
|
--
|
|
2.17.1
|
|
|