Skip to content

Commit 842cd58

Browse files
committed
mmc: assign right mmc card for rk_vendor_storage
use mmc0 for SD bootup device, mmc1 for eMMC bootup device Change-Id: I1cc8068c2f81d03c54af31516bbf065dcf361ef4 (cherry picked from commit b22f7a8693ed93d45e52371c292a382fb36fc2ba)
1 parent c3ee4b3 commit 842cd58

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

drivers/mmc/card/block.c

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2871,11 +2871,19 @@ static int mmc_blk_probe(struct mmc_card *card)
28712871
dev_set_drvdata(&card->dev, md);
28722872

28732873
#if defined(CONFIG_MMC_DW_ROCKCHIP) || defined(CONFIG_MMC_SDHCI_OF_ARASAN)
2874+
md->disk->is_rk_disk = false;
28742875
if (card->host->restrict_caps & RESTRICT_CARD_TYPE_EMMC) {
2875-
this_card = card;
2876-
md->disk->is_rk_disk = true;
2877-
} else {
2878-
md->disk->is_rk_disk = false;
2876+
if ((card->host->restrict_caps & RESTRICT_CARD_TYPE_SD) && strstr(saved_command_line, "storagemedia=sd")) {
2877+
/* mmc0 & SD card bootup */
2878+
pr_info("%s is rk_disk1\n", mmc_card_id(card));
2879+
this_card = card;
2880+
md->disk->is_rk_disk = true;
2881+
} else if ( !(card->host->restrict_caps & RESTRICT_CARD_TYPE_SD) && strstr(saved_command_line, "storagemedia=emmc")){
2882+
/* mmc1 & emmc bootup */
2883+
pr_info("%s is rk_disk2\n", mmc_card_id(card));
2884+
this_card = card;
2885+
md->disk->is_rk_disk = true;
2886+
}
28792887
}
28802888
#endif
28812889

0 commit comments

Comments
 (0)