shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-04-10 23:18:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

mmc: replace tSD enumaration machanism

Browse Source 
Remove dt property "support-tSD" and combine "support-emmc" with
"support-sd" in together for tSD/emmc distinguish by mmc core. More details
please refer to arch/arm/boot/dts/rk3288-tb.dts

Signed-off-by: lintao <lintao@rock-chips.com>
This commit is contained in:
lintao
2015-03-02 09:25:57 +08:00
parent 8c9b006fff
commit 43faede2e2
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/rk3288-tb.dts
View File

@@ -235,9 +235,9 @@
supports-highspeed;
supports-emmc;
//supports-sd;
bootpart-no-access;
//supports-tSD;
//supports-DDR_MODE; //you should set the two value in your project. only close in RK3288-SDK board.
//caps2-mmc-hs200;

4
arch/arm/boot/dts/rk3288-tb_8846.dts
View File

@@ -276,9 +276,9 @@
supports-highspeed;
supports-emmc;
bootpart-no-access;
//supports-sd;
bootpart-no-access;
//supports-tSD;
//supports-DDR_MODE; //you should set the two value in your project. only close in RK3288-SDK board.
//caps2-mmc-hs200;

14
drivers/mmc/core/core.c
View File

@@ -2419,17 +2419,17 @@ static int mmc_rescan_try_freq(struct mmc_host *host, unsigned freq)
mmc_send_if_cond(host, host->ocr_avail);
/* Order's important: probe SDIO, then SD, then MMC */
if ((host->restrict_caps & RESTRICT_CARD_TYPE_SDIO) && !mmc_attach_sdio(host))
if ((host->restrict_caps & RESTRICT_CARD_TYPE_SDIO) &&
!mmc_attach_sdio(host))
return 0;
if ((host->restrict_caps & (RESTRICT_CARD_TYPE_SD | RESTRICT_CARD_TYPE_TSD)) && !mmc_attach_sd(host))
if ((host->restrict_caps & RESTRICT_CARD_TYPE_SD) &&
!mmc_attach_sd(host))
return 0;
if ((host->restrict_caps & RESTRICT_CARD_TYPE_EMMC) &&
!mmc_attach_mmc(host))
return 0;
if ((host->restrict_caps & RESTRICT_CARD_TYPE_EMMC) && !mmc_attach_mmc(host))
return 0;
#endif
mmc_power_off(host);
return -EIO;
}

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

@@ -3441,9 +3441,6 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
mmc->restrict_caps |= RESTRICT_CARD_TYPE_SDIO;
if (of_find_property(host->dev->of_node, "supports-emmc", NULL))
mmc->restrict_caps |= RESTRICT_CARD_TYPE_EMMC;
/* Fixup for tSD */
if (of_find_property(host->dev->of_node, "supports-tSD", NULL))
mmc->restrict_caps |= RESTRICT_CARD_TYPE_TSD;
if (mmc->restrict_caps & RESTRICT_CARD_TYPE_SD) {
mmc->pm_notify.notifier_call = dw_mci_pm_notify;