Skip to content

Commit 25483de

Browse files
committed
dmaengine: Revert "dmaengine: remove s3c24xx driver"
This reverts cccc46a ("dmaengine: remove s3c24xx driver") as it causes regression due to missing header Signed-off-by: Vinod Koul <[email protected]>
1 parent 3a0c95b commit 25483de

File tree

4 files changed

+1489
-0
lines changed

4 files changed

+1489
-0
lines changed

drivers/dma/Kconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,18 @@ config SPRD_DMA
610610
help
611611
Enable support for the on-chip DMA controller on Spreadtrum platform.
612612

613+
config S3C24XX_DMAC
614+
bool "Samsung S3C24XX DMA support"
615+
depends on ARCH_S3C24XX || COMPILE_TEST
616+
select DMA_ENGINE
617+
select DMA_VIRTUAL_CHANNELS
618+
help
619+
Support for the Samsung S3C24XX DMA controller driver. The
620+
DMA controller is having multiple DMA channels which can be
621+
configured for different peripherals like audio, UART, SPI.
622+
The DMA controller can transfer data from memory to peripheral,
623+
periphal to memory, periphal to periphal and memory to memory.
624+
613625
config TXX9_DMAC
614626
tristate "Toshiba TXx9 SoC DMA support"
615627
depends on MACH_TX49XX

drivers/dma/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ obj-$(CONFIG_STM32_DMA) += stm32-dma.o
7070
obj-$(CONFIG_STM32_DMAMUX) += stm32-dmamux.o
7171
obj-$(CONFIG_STM32_MDMA) += stm32-mdma.o
7272
obj-$(CONFIG_SPRD_DMA) += sprd-dma.o
73+
obj-$(CONFIG_S3C24XX_DMAC) += s3c24xx-dma.o
7374
obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
7475
obj-$(CONFIG_TEGRA186_GPC_DMA) += tegra186-gpc-dma.o
7576
obj-$(CONFIG_TEGRA20_APB_DMA) += tegra20-apb-dma.o

0 commit comments

Comments
 (0)