Commit 978ce50d authored by Boojin Kim's avatar Boojin Kim Committed by Vinod Koul
Browse files

ARM: SAMSUNG: Remove S3C-PL330-DMA driver



Since DMA generic APIs can be used for Samsung DMA now so that
the s3c-pl330 which includes Samsung specific DMA APIs can be
removed.

Signed-off-by: default avatarBoojin Kim <boojin.kim@samsung.com>
Cc: Jassi Brar <jassisinghbrar@gmail.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 3091e611
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -300,12 +300,6 @@ config S3C_DMA
	help
	  Internal configuration for S3C DMA core

config S3C_PL330_DMA
	bool
	select PL330
	help
	  S3C DMA API Driver for PL330 DMAC.

config SAMSUNG_DMADEV
	bool
	select DMADEVICES
+0 −2
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ obj-$(CONFIG_S3C_DMA) += dma.o s3c-dma-ops.o

obj-$(CONFIG_SAMSUNG_DMADEV)	+= dma-ops.o

obj-$(CONFIG_S3C_PL330_DMA)	+= s3c-pl330.o s3c-dma-ops.o

# PM support

obj-$(CONFIG_PM)		+= pm.o
+6 −4
Original line number Diff line number Diff line
@@ -11,9 +11,6 @@
#ifndef __DMA_PL330_H_
#define __DMA_PL330_H_ __FILE__

#define S3C2410_DMAF_AUTOSTART		(1 << 0)
#define S3C2410_DMAF_CIRCULAR		(1 << 1)

/*
 * PL330 can assign any channel to communicate with
 * any of the peripherals attched to the DMAC.
@@ -88,6 +85,10 @@ enum dma_ch {
	DMACH_MAX,
};

struct s3c2410_dma_client {
	char	*name;
};

static inline bool s3c_dma_has_circular(void)
{
	return true;
@@ -97,6 +98,7 @@ static inline bool samsung_dma_is_dmadev(void)
{
	return true;
}
#include <plat/dma.h>

#include <plat/dma-ops.h>

#endif	/* __DMA_PL330_H_ */
+0 −32
Original line number Diff line number Diff line
/* linux/arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h
 *
 * Copyright (C) 2010 Samsung Electronics Co. Ltd.
 *	Jaswinder Singh <jassi.brar@samsung.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 */

#ifndef __S3C_PL330_PDATA_H
#define __S3C_PL330_PDATA_H

#include <plat/dma-pl330.h>

/*
 * Every PL330 DMAC has max 32 peripheral interfaces,
 * of which some may be not be really used in your
 * DMAC's configuration.
 * Populate this array of 32 peri i/fs with relevant
 * channel IDs for used peri i/f and DMACH_MAX for
 * those unused.
 *
 * The platforms just need to provide this info
 * to the S3C DMA API driver for PL330.
 */
struct s3c_pl330_platdata {
	enum dma_ch peri[32];
};

#endif /* __S3C_PL330_PDATA_H */

arch/arm/plat-samsung/s3c-pl330.c

deleted100644 → 0
+0 −1244

File deleted.

Preview size limit exceeded, changes collapsed.