Commit 25483ded authored by Vinod Koul's avatar Vinod Koul
Browse files

dmaengine: Revert "dmaengine: remove s3c24xx driver" 



This reverts cccc46ae ("dmaengine: remove s3c24xx driver") as it
causes regression due to missing header

Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 3a0c95b6

drivers/dma/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -610,6 +610,18 @@ config SPRD_DMA 
	help

	  Enable support for the on-chip DMA controller on Spreadtrum platform.



config S3C24XX_DMAC

	bool "Samsung S3C24XX DMA support"

	depends on ARCH_S3C24XX || COMPILE_TEST

	select DMA_ENGINE

	select DMA_VIRTUAL_CHANNELS

	help

	  Support for the Samsung S3C24XX DMA controller driver. The

	  DMA controller is having multiple DMA channels which can be

	  configured for different peripherals like audio, UART, SPI.

	  The DMA controller can transfer data from memory to peripheral,

	  periphal to memory, periphal to periphal and memory to memory.



config TXX9_DMAC

	tristate "Toshiba TXx9 SoC DMA support"

	depends on MACH_TX49XX

drivers/dma/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ obj-$(CONFIG_STM32_DMA) += stm32-dma.o 
obj-$(CONFIG_STM32_DMAMUX) += stm32-dmamux.o

obj-$(CONFIG_STM32_MDMA) += stm32-mdma.o

obj-$(CONFIG_SPRD_DMA) += sprd-dma.o

obj-$(CONFIG_S3C24XX_DMAC) += s3c24xx-dma.o

obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o

obj-$(CONFIG_TEGRA186_GPC_DMA) += tegra186-gpc-dma.o

obj-$(CONFIG_TEGRA20_APB_DMA) += tegra20-apb-dma.o

drivers/dma/s3c24xx-dma.c

0 → 100644
+1428 −0

File added.

Preview size limit exceeded, changes collapsed.

include/linux/platform_data/dma-s3c24xx.h

0 → 100644
+48 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

/*

 * S3C24XX DMA handling

 *

 * Copyright (c) 2013 Heiko Stuebner <heiko@sntech.de>

 */



/* Helper to encode the source selection constraints for early s3c socs. */

#define S3C24XX_DMA_CHANREQ(src, chan)	((BIT(3) | src) << chan * 4)



enum s3c24xx_dma_bus {

	S3C24XX_DMA_APB,

	S3C24XX_DMA_AHB,

};



/**

 * @bus: on which bus does the peripheral reside - AHB or APB.

 * @handshake: is a handshake with the peripheral necessary

 * @chansel: channel selection information, depending on variant; reqsel for

 *	     s3c2443 and later and channel-selection map for earlier SoCs

 *	     see CHANSEL doc in s3c2443-dma.c

 */

struct s3c24xx_dma_channel {

	enum s3c24xx_dma_bus bus;

	bool handshake;

	u16 chansel;

};



struct dma_slave_map;



/**

 * struct s3c24xx_dma_platdata - platform specific settings

 * @num_phy_channels: number of physical channels

 * @channels: array of virtual channel descriptions

 * @num_channels: number of virtual channels

 * @slave_map: dma slave map matching table

 * @slavecnt: number of elements in slave_map

 */

struct s3c24xx_dma_platdata {

	int num_phy_channels;

	struct s3c24xx_dma_channel *channels;

	int num_channels;

	const struct dma_slave_map *slave_map;

	int slavecnt;

};



struct dma_chan;

bool s3c24xx_dma_filter(struct dma_chan *chan, void *param);