public inbox for linux-mmc@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Revert "mmc: dw_mmc: Add check for IDMAC configuration"
@ 2012-09-11  2:23 Seungwon Jeon
  2012-09-11  3:46 ` Girish K S
  2012-09-17 11:15 ` Will Newton
  0 siblings, 2 replies; 14+ messages in thread
From: Seungwon Jeon @ 2012-09-11  2:23 UTC (permalink / raw)
  To: linux-mmc; +Cc: cjb, girish.shivananjappa, will.newton, 'James Hogan'

This reverts commit 94c6cee91(Add check for IDMAC configuration).
Synopsys says that only if internal dmac is not present, optional
external dma interface is present. When internal dmac is present,
'0' value in DMA_INTERFACE of HCON is reasonable. DMA_INTERFACE
indicates external dma interface. And idmac initialization is
prohibited now. So, let's revert this commit.

CC: Girish K S <girish.shivananjappa@linaro.org>
Signed-off-by: Seungwon Jeon <tgih.jun@samsung.com>
---
 drivers/mmc/host/dw_mmc.c |   15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 36f98c0..dcbe9aa 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -405,23 +405,11 @@ static void dw_mci_idmac_start_dma(struct dw_mci *host, unsigned int sg_len)
 static int dw_mci_idmac_init(struct dw_mci *host)
 {
 	struct idmac_desc *p;
-	int i, dma_support;
+	int i;
 
 	/* Number of descriptors in the ring buffer */
 	host->ring_size = PAGE_SIZE / sizeof(struct idmac_desc);
 
-	/* Check if Hardware Configuration Register has support for DMA */
-	dma_support = (mci_readl(host, HCON) >> 16) & 0x3;
-
-	if (!dma_support || dma_support > 2) {
-		dev_err(&host->dev,
-			"Host Controller does not support IDMA Tx.\n");
-		host->dma_ops = NULL;
-		return -ENODEV;
-	}
-
-	dev_info(&host->dev, "Using internal DMA controller.\n");
-
 	/* Forward link the descriptor list */
 	for (i = 0, p = host->sg_cpu; i < host->ring_size - 1; i++, p++)
 		p->des3 = host->sg_dma + (sizeof(struct idmac_desc) * (i + 1));
@@ -1895,6 +1883,7 @@ static void dw_mci_init_dma(struct dw_mci *host)
 	/* Determine which DMA interface to use */
 #ifdef CONFIG_MMC_DW_IDMAC
 	host->dma_ops = &dw_mci_idmac_ops;
+	dev_info(&host->dev, "Using internal DMA controller.\n");
 #endif
 
 	if (!host->dma_ops)
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2012-09-19  6:03 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-11  2:23 [PATCH] Revert "mmc: dw_mmc: Add check for IDMAC configuration" Seungwon Jeon
2012-09-11  3:46 ` Girish K S
2012-09-11  4:36   ` Jaehoon Chung
2012-09-11  4:40     ` Girish K S
2012-09-11  4:46       ` Jaehoon Chung
2012-09-11  5:46   ` Seungwon Jeon
2012-09-11  5:58     ` Girish K S
2012-09-11  6:39       ` Seungwon Jeon
2012-09-11  7:11         ` Girish K S
2012-09-11  7:14           ` Girish K S
2012-09-12  2:21             ` Seungwon Jeon
2012-09-12  4:08               ` Girish K S
2012-09-17 11:15 ` Will Newton
2012-09-19  6:03   ` Chris Ball

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox