dma: intel: Merge cavs and ace gpdma

cAVS and ACE gpdma driver have several similarities. This commit merge this two drivers into a single one for Intel ADSP devices. Signed-off-by: Flavio Ceolin <flavio.ceolin@intel.com>
zephyrproject-rtos · Jul 11, 2022 · ad8ae7f · ad8ae7f
1 parent d8c7aed
commit ad8ae7f
Show file tree

Hide file tree

Showing 14 changed files with 129 additions and 422 deletions.
diff --git a/drivers/dma/CMakeLists.txt b/drivers/dma/CMakeLists.txt
@@ -16,10 +16,9 @@ zephyr_library_sources_ifdef(CONFIG_DMA_MCUX_LPC	dma_mcux_lpc.c)
 zephyr_library_sources_ifdef(CONFIG_DMA_PL330		dma_pl330.c)
 zephyr_library_sources_ifdef(CONFIG_DMA_IPROC_PAX	dma_iproc_pax_v1.c)
 zephyr_library_sources_ifdef(CONFIG_DMA_IPROC_PAX_V2	dma_iproc_pax_v2.c)
-zephyr_library_sources_ifdef(CONFIG_DMA_CAVS_GPDMA	dma_cavs_gpdma.c dma_dw_common.c)
 zephyr_library_sources_ifdef(CONFIG_DMA_CAVS_HDA dma_cavs_hda.c)
 zephyr_library_sources_ifdef(CONFIG_DMA_CAVS_HDA_HOST_IN dma_cavs_hda_host_in.c)
 zephyr_library_sources_ifdef(CONFIG_DMA_CAVS_HDA_HOST_OUT dma_cavs_hda_host_out.c)
 zephyr_library_sources_ifdef(CONFIG_DMA_CAVS_HDA_LINK_IN dma_cavs_hda_link_in.c)
 zephyr_library_sources_ifdef(CONFIG_DMA_CAVS_HDA_LINK_OUT dma_cavs_hda_link_out.c)
-zephyr_library_sources_ifdef(CONFIG_DMA_ACE_GPDMA	dma_ace_gpdma.c dma_dw_common.c)
+zephyr_library_sources_ifdef(CONFIG_DMA_INTEL_ADSP_GPDMA	dma_intel_adsp_gpdma.c dma_dw_common.c)
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
@@ -44,9 +44,7 @@ source "drivers/dma/Kconfig.dma_pl330"
 
 source "drivers/dma/Kconfig.iproc_pax"
 
-source "drivers/dma/Kconfig.cavs_gpdma"
-
-source "drivers/dma/Kconfig.ace_gpdma"
+source "drivers/dma/Kconfig.intel_adsp_gpdma"
 
 source "drivers/dma/Kconfig.cavs_hda"
 

diff --git a/drivers/dma/Kconfig.ace_gpdma b/drivers/dma/Kconfig.ace_gpdma
diff --git a/drivers/dma/Kconfig.cavs_gpdma b/drivers/dma/Kconfig.cavs_gpdma
diff --git a/drivers/dma/Kconfig.intel_adsp_gpdma b/drivers/dma/Kconfig.intel_adsp_gpdma
@@ -0,0 +1,22 @@
+# DMA configuration options
+
+# Copyright (c) 2022 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config DMA_INTEL_ADSP_GPDMA
+	bool "Intel ADSP General Purpose Direct Memory Access driver"
+	help
+	  Intel ADSP DMA driver.
+
+if DMA_INTEL_ADSP_GPDMA
+
+config DMA_INTEL_ADSP_GPDMA_HAS_LLP
+	bool "Intel ADSP GPDMA Linear Link Position Feature"
+	default y if SOC_SERIES_INTEL_ACE1X
+	help
+	  Intel ADSP GPDMA may optionally have a linear link position
+	  feature.
+
+source "drivers/dma/Kconfig.dw_common"
+
+endif # DMA_INTEL_ADSP_GPDMA
diff --git a/drivers/dma/dma_cavs_gpdma.c b/drivers/dma/dma_cavs_gpdma.c