From: lintao <lintao@rock-chips.com>
Date: Fri, 19 Sep 2014 06:17:09 +0000 (+0800)
Subject: mmc: unnecessary to dynamic request and release slave chn.
X-Git-Tag: firefly_0821_release~4658
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e4ad383ea8512a12c4cf2514a6a57e2075da2dff;p=firefly-linux-kernel-4.4.55.git

mmc: unnecessary to dynamic request and release slave chn.
---

diff --git a/drivers/mmc/host/rk_sdmmc.c b/drivers/mmc/host/rk_sdmmc.c
index c956f9f8f6e3..a20fec90a7c7 100755
--- a/drivers/mmc/host/rk_sdmmc.c
+++ b/drivers/mmc/host/rk_sdmmc.c
@@ -4053,9 +4053,6 @@ int dw_mci_suspend(struct dw_mci *host)
         if(host->vmmc)
                 regulator_disable(host->vmmc);
 
-        if(host->use_dma && host->dma_ops->exit)
-                host->dma_ops->exit(host);
-
         /*only for sdmmc controller*/
         if (host->mmc->restrict_caps & RESTRICT_CARD_TYPE_SD) {
                 host->mmc->rescan_disable = 1;
@@ -4089,13 +4086,8 @@ int dw_mci_resume(struct dw_mci *host)
     
         if (host->mmc->restrict_caps & RESTRICT_CARD_TYPE_SDIO) {
                 slot = mmc_priv(host->mmc);
-                if (!test_bit(DW_MMC_CARD_PRESENT, &slot->flags)) {
-			/* edmac contains exit function call when suspend*/
-			if(host->use_dma && host->dma_ops->init && host->dma_ops->exit)
-				host->dma_ops->init(host);
-
+                if(!test_bit(DW_MMC_CARD_PRESENT, &slot->flags))
 			return 0;
-		}
         }
 
     	/*only for sdmmc controller*/
@@ -4132,8 +4124,9 @@ int dw_mci_resume(struct dw_mci *host)
 		return ret;
 	}
 
-	if(host->use_dma && host->dma_ops->init)
-		host->dma_ops->init(host);
+	if(!(cpu_is_rk3036() || cpu_is_rk312x()))
+		if(host->use_dma && host->dma_ops->init)
+			host->dma_ops->init(host);
 
 	/*
 	 * Restore the initial value at FIFOTH register