From cc8c453c3fc90e8a0114dc316f9a5db69354d1c6 Mon Sep 17 00:00:00 2001 From: Shawn Lin Date: Wed, 4 Jan 2017 15:13:38 +0800 Subject: [PATCH] mmc: block: add dependency of emmc_disk flag Rockchip platform now not only use dw_mmc but also the sdhci-of-arasan could be used as emmc. So we need to add its dependency when setting emmc_disk flag. Change-Id: I84f99657b874a15e60063b1b4ff94fd90cc191c3 Signed-off-by: Shawn Lin --- drivers/mmc/card/block.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index c7e0db49783b..ac96333f9788 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -2870,14 +2870,14 @@ static int mmc_blk_probe(struct mmc_card *card) dev_set_drvdata(&card->dev, md); - #if defined(CONFIG_MMC_DW_ROCKCHIP) +#if defined(CONFIG_MMC_DW_ROCKCHIP) || defined(CONFIG_MMC_SDHCI_OF_ARASAN) if (card->host->restrict_caps & RESTRICT_CARD_TYPE_EMMC) { this_card = card; md->disk->emmc_disk = 1; } else { md->disk->emmc_disk = 0; } - #endif +#endif if (mmc_add_disk(md)) goto out; @@ -2911,10 +2911,10 @@ static void mmc_blk_remove(struct mmc_card *card) { struct mmc_blk_data *md = dev_get_drvdata(&card->dev); - #if defined(CONFIG_MMC_DW_ROCKCHIP) +#if defined(CONFIG_MMC_DW_ROCKCHIP) || defined(CONFIG_MMC_SDHCI_OF_ARASAN) if (card->host->restrict_caps & RESTRICT_CARD_TYPE_EMMC) this_card = NULL; - #endif +#endif mmc_blk_remove_parts(card, md); pm_runtime_get_sync(&card->dev); -- 2.34.1