Skip to content

Commit

Permalink
ARM: SAMSUNG: Remove S3C-PL330-DMA driver
Browse files Browse the repository at this point in the history
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: Boojin Kim <boojin.kim@samsung.com>
Cc: Jassi Brar <jassisinghbrar@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
  • Loading branch information
Boojin Kim authored and Vinod Koul committed Sep 14, 2011
1 parent 3091e61 commit 978ce50
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 1,288 deletions.
6 changes: 0 additions & 6 deletions arch/arm/plat-samsung/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/plat-samsung/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions arch/arm/plat-samsung/include/plat/dma-pl330.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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;
Expand All @@ -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_ */
32 changes: 0 additions & 32 deletions arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h

This file was deleted.

Loading

0 comments on commit 978ce50

Please sign in to comment.