diff mbox

[U-Boot,v2,4/6] spi: ti_qspi: compile out spi_flash_copy_mmap when CONFIG_DMA is defined

Message ID 1450888983-21855-5-git-send-email-mugunthanvnm@ti.com
State Accepted
Commit 518b0afc33b09160afb0f6ac33c5de499c2b95d9
Delegated to: Simon Glass
Headers show

Commit Message

Mugunthan V N Dec. 23, 2015, 4:43 p.m. UTC 
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>
---
 drivers/spi/ti_qspi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Simon Glass Jan. 6, 2016, 12:24 a.m. UTC | #1 
On 23 December 2015 at 09:43, Mugunthan V N <mugunthanvnm@ti.com> wrote:
> 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>
> ---
>  drivers/spi/ti_qspi.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>
diff mbox

Patch

diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c
index 78d8b13..32cc07b 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);