From 653e67f7e5e008258ff65c2067460cc9e8ee8f94 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Mon, 14 Jul 2014 22:47:26 +0200 Subject: dmaengine: inherit debug settings from the subsystem for subdirectories To be able to see debug messages during boot, enable the debug settings from Kconfig also for drivers in subdirectories. Signed-off-by: Wolfram Sang Signed-off-by: Vinod Koul --- drivers/dma/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/dma/Makefile') diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile index c779e1eb2db2..aca5eb577d44 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -1,5 +1,5 @@ -ccflags-$(CONFIG_DMADEVICES_DEBUG) := -DDEBUG -ccflags-$(CONFIG_DMADEVICES_VDEBUG) += -DVERBOSE_DEBUG +subdir-ccflags-$(CONFIG_DMADEVICES_DEBUG) := -DDEBUG +subdir-ccflags-$(CONFIG_DMADEVICES_VDEBUG) += -DVERBOSE_DEBUG obj-$(CONFIG_DMA_ENGINE) += dmaengine.o obj-$(CONFIG_DMA_VIRTUAL_CHANNELS) += virt-dma.o -- cgit v1.2.3 From 555859308723d8d5b828304f5eb9281143fd86b5 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 17 Jul 2014 21:46:16 +0200 Subject: dmaengine: sun6i: Add driver for the Allwinner A31 DMA controller The Allwinner A31 has a 16 channels DMA controller that it shares with the newer A23. Although sharing some similarities with the DMA controller of the older Allwinner SoCs, it's significantly different, I don't expect it to be possible to share the driver for these two. The A31 Controller is able to memory-to-memory or memory-to-device transfers on the 16 channels in parallel. Signed-off-by: Maxime Ripard Acked-by: Arnd Bergmann Signed-off-by: Vinod Koul --- drivers/dma/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/dma/Makefile') diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile index aca5eb577d44..d08bd966da13 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -47,3 +47,4 @@ obj-$(CONFIG_MOXART_DMA) += moxart-dma.o obj-$(CONFIG_FSL_EDMA) += fsl-edma.o obj-$(CONFIG_QCOM_BAM_DMA) += qcom_bam_dma.o obj-y += xilinx/ +obj-$(CONFIG_DMA_SUN6I) += sun6i-dma.o -- cgit v1.2.3 From b45b262cefd5b8eb2ba88d20e5bd295881293894 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Sat, 19 Jul 2014 12:48:51 +0200 Subject: dmaengine: add a driver for AMBA AXI NBPF DMAC IP cores This patch adds a driver for NBPF DMAC IP cores from Renesas, designed for the AMBA AXI bus. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Vinod Koul --- drivers/dma/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/dma/Makefile') diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile index d08bd966da13..f2b831a994cf 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -47,4 +47,5 @@ obj-$(CONFIG_MOXART_DMA) += moxart-dma.o obj-$(CONFIG_FSL_EDMA) += fsl-edma.o obj-$(CONFIG_QCOM_BAM_DMA) += qcom_bam_dma.o obj-y += xilinx/ +obj-$(CONFIG_NBPFAXI_DMA) += nbpfaxi.o obj-$(CONFIG_DMA_SUN6I) += sun6i-dma.o -- cgit v1.2.3