Browse Source

dmaengine: qcom_bam_dma: move to qcom directory

Creating a QCOM directory for all QCOM DMA source files.

Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
Reviewed-by: Andy Gross <agross@codeaurora.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Sinan Kaya 9 years ago
parent
commit
d9b31efcbf
5 changed files with 14 additions and 12 deletions
  1. 2 9
      drivers/dma/Kconfig
  2. 1 1
      drivers/dma/Makefile
  3. 8 0
      drivers/dma/qcom/Kconfig
  4. 1 0
      drivers/dma/qcom/Makefile
  5. 2 2
      drivers/dma/qcom/bam_dma.c

+ 2 - 9
drivers/dma/Kconfig

@@ -408,15 +408,6 @@ config PXA_DMA
 	  16 to 32 channels for peripheral to memory or memory to memory
 	  16 to 32 channels for peripheral to memory or memory to memory
 	  transfers.
 	  transfers.
 
 
-config QCOM_BAM_DMA
-	tristate "QCOM BAM DMA support"
-	depends on ARCH_QCOM || (COMPILE_TEST && OF && ARM)
-	select DMA_ENGINE
-	select DMA_VIRTUAL_CHANNELS
-	---help---
-	  Enable support for the QCOM BAM DMA controller.  This controller
-	  provides DMA capabilities for a variety of on-chip devices.
-
 config SIRF_DMA
 config SIRF_DMA
 	tristate "CSR SiRFprimaII/SiRFmarco DMA support"
 	tristate "CSR SiRFprimaII/SiRFmarco DMA support"
 	depends on ARCH_SIRF
 	depends on ARCH_SIRF
@@ -539,6 +530,8 @@ config ZX_DMA
 # driver files
 # driver files
 source "drivers/dma/bestcomm/Kconfig"
 source "drivers/dma/bestcomm/Kconfig"
 
 
+source "drivers/dma/qcom/Kconfig"
+
 source "drivers/dma/dw/Kconfig"
 source "drivers/dma/dw/Kconfig"
 
 
 source "drivers/dma/hsu/Kconfig"
 source "drivers/dma/hsu/Kconfig"

+ 1 - 1
drivers/dma/Makefile

@@ -52,7 +52,6 @@ obj-$(CONFIG_PCH_DMA) += pch_dma.o
 obj-$(CONFIG_PL330_DMA) += pl330.o
 obj-$(CONFIG_PL330_DMA) += pl330.o
 obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/
 obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/
 obj-$(CONFIG_PXA_DMA) += pxa_dma.o
 obj-$(CONFIG_PXA_DMA) += pxa_dma.o
-obj-$(CONFIG_QCOM_BAM_DMA) += qcom_bam_dma.o
 obj-$(CONFIG_RENESAS_DMA) += sh/
 obj-$(CONFIG_RENESAS_DMA) += sh/
 obj-$(CONFIG_SIRF_DMA) += sirf-dma.o
 obj-$(CONFIG_SIRF_DMA) += sirf-dma.o
 obj-$(CONFIG_STE_DMA40) += ste_dma40.o ste_dma40_ll.o
 obj-$(CONFIG_STE_DMA40) += ste_dma40.o ste_dma40_ll.o
@@ -67,4 +66,5 @@ obj-$(CONFIG_TI_EDMA) += edma.o
 obj-$(CONFIG_XGENE_DMA) += xgene-dma.o
 obj-$(CONFIG_XGENE_DMA) += xgene-dma.o
 obj-$(CONFIG_ZX_DMA) += zx296702_dma.o
 obj-$(CONFIG_ZX_DMA) += zx296702_dma.o
 
 
+obj-y += qcom/
 obj-y += xilinx/
 obj-y += xilinx/

+ 8 - 0
drivers/dma/qcom/Kconfig

@@ -0,0 +1,8 @@
+config QCOM_BAM_DMA
+	tristate "QCOM BAM DMA support"
+	depends on ARCH_QCOM || (COMPILE_TEST && OF && ARM)
+	select DMA_ENGINE
+	select DMA_VIRTUAL_CHANNELS
+	---help---
+	  Enable support for the QCOM BAM DMA controller.  This controller
+	  provides DMA capabilities for a variety of on-chip devices.

+ 1 - 0
drivers/dma/qcom/Makefile

@@ -0,0 +1 @@
+obj-$(CONFIG_QCOM_BAM_DMA) += bam_dma.o

+ 2 - 2
drivers/dma/qcom_bam_dma.c → drivers/dma/qcom/bam_dma.c

@@ -49,8 +49,8 @@
 #include <linux/clk.h>
 #include <linux/clk.h>
 #include <linux/dmaengine.h>
 #include <linux/dmaengine.h>
 
 
-#include "dmaengine.h"
-#include "virt-dma.h"
+#include "../dmaengine.h"
+#include "../virt-dma.h"
 
 
 struct bam_desc_hw {
 struct bam_desc_hw {
 	__le32 addr;		/* Buffer physical address */
 	__le32 addr;		/* Buffer physical address */