openstlinux/linux-st
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "mmc: mmci: manage MMC_PM_KEEP_POWER with a flag"

Browse Source 
This reverts commit 92f9e495c4.

Change-Id: Ie0a1b7d9e0db73e241ee2db04f6e405c280fb07c
Signed-off-by: Yann Gautier <yann.gautier@foss.st.com>
Reviewed-on: https://gerrit.st.com/c/mpu/oe/st/linux-stm32/+/247757
Reviewed-by: CITOOLS <MDG-smet-aci-reviews@list.st.com>
Reviewed-by: CIBUILD <MDG-smet-aci-builds@list.st.com>
Reviewed-by: Christophe KERELLO <christophe.kerello@st.com>
This commit is contained in:
Yann Gautier
2022-04-11 16:51:02 +02:00
committed by Eric Fourmont
parent 2780540b16
commit 80ff65f1d5
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/mmc/host/mmci.c
View File

@ -274,7 +274,6 @@ static struct variant_data variant_stm32_sdmmc = {
.busy_detect = true,
.busy_detect_flag = MCI_STM32_BUSYD0,
.busy_detect_mask = MCI_STM32_BUSYD0ENDMASK,
.disable_keep_power = true,
.init = sdmmc_variant_init,
};
@ -302,7 +301,6 @@ static struct variant_data variant_stm32_sdmmcv2 = {
.busy_detect = true,
.busy_detect_flag = MCI_STM32_BUSYD0,
.busy_detect_mask = MCI_STM32_BUSYD0ENDMASK,
.disable_keep_power = true,
.init = sdmmc_variant_init,
};
@ -2170,7 +2168,6 @@ static int mmci_probe(struct amba_device *dev,
host->stop_abort.flags = MMC_RSP_R1B | MMC_CMD_AC;
/* We support these PM capabilities. */
if (!variant->disable_keep_power)
mmc->pm_caps |= MMC_PM_KEEP_POWER;
/*

1
drivers/mmc/host/mmci.h
View File

@ -361,7 +361,6 @@ struct variant_data {
u32 opendrain;
u8 dma_lli:1;
u32 stm32_idmabsize_mask;
u8 disable_keep_power:1;
void (*init)(struct mmci_host *host);
};