Skip to content

Commit

Permalink
DMA: PL330: Merge PL330 driver into drivers/dma/
Browse files Browse the repository at this point in the history
Currently there were two part of DMAC PL330 driver for
support old styled s3c-pl330 which has been merged into
drivers/dma/pl330.c driver. Actually, there is no reason
to separate them now.

Basically this patch merges arch/arm/common/pl330.c into
drivers/dma/pl330.c driver and removes useless exported
symbol, externed function and so on.

The newer pl330 driver tested on SMDKV310 and SMDK4212 boards

Cc: Jassi Brar <jassisinghbrar@gmail.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Boojin Kim <boojin.kim@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
  • Loading branch information
Boojin Kim authored and Vinod Koul committed Mar 8, 2012
1 parent 6d0d7e2 commit b7d861d
Show file tree
Hide file tree
Showing 7 changed files with 2,113 additions and 2,183 deletions.
3 changes: 0 additions & 3 deletions arch/arm/common/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ config ARM_VIC_NR
config ICST
bool

config PL330
bool

config SA1111
bool
select DMABOUNCE if !ARCH_PXA
Expand Down
1 change: 0 additions & 1 deletion arch/arm/common/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
obj-$(CONFIG_ARM_GIC) += gic.o
obj-$(CONFIG_ARM_VIC) += vic.o
obj-$(CONFIG_ICST) += icst.o
obj-$(CONFIG_PL330) += pl330.o
obj-$(CONFIG_SA1111) += sa1111.o
obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o
obj-$(CONFIG_DMABOUNCE) += dmabounce.o
Expand Down
Loading

0 comments on commit b7d861d

Please sign in to comment.