From: Mugunthan V N <mugunthanvnm@ti.com>
Date: Mon, 15 Feb 2016 10:01:40 +0000 (+0530)
Subject: spi: ti_qspi: compile out spi_flash_copy_mmap when CONFIG_DMA is defined
X-Git-Tag: v2016.03-rc3~57^2~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=518b0afc33b09160afb0f6ac33c5de499c2b95d9;p=u-boot

spi: ti_qspi: compile out spi_flash_copy_mmap when CONFIG_DMA is defined

When CONFIG_DMA is defined the default spi_flash_copy_mmap() can
handle dma memory copy, so compile out spi_flash_copy_mmap() from
ti_qspi driver when CONFIG_DMA config is defined.

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jagan Teki <jteki@openedev.com>
---

diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c
index b5c974ce38..409a5c41ab 100644
--- a/drivers/spi/ti_qspi.c
+++ b/drivers/spi/ti_qspi.c
@@ -277,7 +277,7 @@ static int __ti_qspi_xfer(struct ti_qspi_priv *priv, unsigned int bitlen,
 }
 
 /* TODO: control from sf layer to here through dm-spi */
-#ifdef CONFIG_TI_EDMA3
+#if defined(CONFIG_TI_EDMA3) && !defined(CONFIG_DMA)
 void spi_flash_copy_mmap(void *data, void *offset, size_t len)
 {
 	unsigned int			addr = (unsigned int) (data);