UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: 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>
This commit is contained in:
Boojin Kim 2011-09-02 09:44:40 +09:00 committed by Vinod Koul
parent 3091e61173
commit 978ce50dd5
5 changed files with 6 additions and 1288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/plat-samsung/Kconfig
View File

@ -300,12 +300,6 @@ config S3C_DMA
help help
Internal configuration for S3C DMA core Internal configuration for S3C DMA core
config S3C_PL330_DMA
bool
select PL330
help
S3C DMA API Driver for PL330 DMAC.
config SAMSUNG_DMADEV config SAMSUNG_DMADEV
bool bool
select DMADEVICES select DMADEVICES

2
arch/arm/plat-samsung/Makefile
View File

@ -67,8 +67,6 @@ obj-$(CONFIG_S3C_DMA) += dma.o s3c-dma-ops.o
obj-$(CONFIG_SAMSUNG_DMADEV) += dma-ops.o obj-$(CONFIG_SAMSUNG_DMADEV) += dma-ops.o
obj-$(CONFIG_S3C_PL330_DMA) += s3c-pl330.o s3c-dma-ops.o
# PM support # PM support
obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_PM) += pm.o

10
arch/arm/plat-samsung/include/plat/dma-pl330.h
View File

@ -11,9 +11,6 @@
#ifndef __DMA_PL330_H_ #ifndef __DMA_PL330_H_
#define __DMA_PL330_H_ __FILE__ #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 * PL330 can assign any channel to communicate with
* any of the peripherals attched to the DMAC. * any of the peripherals attched to the DMAC.
@ -88,6 +85,10 @@ enum dma_ch {
DMACH_MAX, DMACH_MAX,
}; };
struct s3c2410_dma_client {
char *name;
};
static inline bool s3c_dma_has_circular(void) static inline bool s3c_dma_has_circular(void)
{ {
return true; return true;
@ -97,6 +98,7 @@ static inline bool samsung_dma_is_dmadev(void)
{ {
return true; return true;
} }
#include <plat/dma.h>
#include <plat/dma-ops.h>
#endif /* __DMA_PL330_H_ */ #endif /* __DMA_PL330_H_ */

32
arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h
View File

@ -1,32 +0,0 @@
/* 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 */

1244
arch/arm/plat-samsung/s3c-pl330.c
View File

File diff suppressed because it is too large Load Diff