shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

mmc: dw_mmc: Fix thunder boot support

Browse Source 
Migrate to use new properties.

Fixes: af02b05e59 ("mmc: add thunder boot support")
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I26e1c5b65a994522fdfd5cbc54ed17909bbaa95f
This commit is contained in:
Shawn Lin
2021-05-14 17:37:23 +08:00
committed by Tao Huang
parent c44e5e04a4
commit 855b2834d4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mmc/host/dw_mmc.c
View File

@@ -221,7 +221,8 @@ static void dw_mci_wait_while_busy(struct dw_mci *host, u32 cmd_flags)
* expected.
*/
#ifdef CONFIG_ROCKCHIP_THUNDER_BOOT
if (host->slot->mmc->restrict_caps & RESTRICT_CARD_TYPE_EMMC)
if (host->slot->mmc->caps2 & MMC_CAP2_NO_SD &&
host->slot->mmc->caps2 & MMC_CAP2_NO_SDIO)
delay = 0;
#endif
if ((cmd_flags & SDMMC_CMD_PRV_DAT_WAIT) &&
@@ -3239,7 +3240,8 @@ int dw_mci_probe(struct dw_mci *host)
struct device *dev = host->dev;
u32 intr;
if (device_property_read_bool(host->dev, "supports-emmc")) {
if (host->slot->mmc->caps2 & MMC_CAP2_NO_SD &&
host->slot->mmc->caps2 & MMC_CAP2_NO_SDIO) {
if (readl_poll_timeout(host->regs + SDMMC_STATUS,
fifo_size,
!(fifo_size & (BIT(10) | GENMASK(7, 4))),