aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorJassi Brar <jassi.brar@samsung.com>2010-05-06 21:21:39 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-05-07 11:35:44 -0400
commitc4806174c516d26bf4a72db1789cfc96e4950d07 (patch)
tree9365b10b74e2f03d0a3ee126af09b3af4f61611a /arch/arm
parent8a7c251871eff512fb380ea0e86c77ed901520fe (diff)
ARM: S3C2412: DMA: Remove I2S FIFO address
The S3C DMA API doesn't make use of hw_addr.to/from and also the FIFO addresses are provided from the I2S drivers. So these fields are redundant. This patch removes the hw_addr.to/from fields for I2S and the inclusion of header, paving way for the header to be moved closer to the I2S controller drivers. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Acked-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-s3c2412/dma.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2412/dma.c b/arch/arm/mach-s3c2412/dma.c
index e880524904eb..7abecfca0b7e 100644
--- a/arch/arm/mach-s3c2412/dma.c
+++ b/arch/arm/mach-s3c2412/dma.c
@@ -30,7 +30,6 @@
30#include <mach/regs-mem.h> 30#include <mach/regs-mem.h>
31#include <mach/regs-lcd.h> 31#include <mach/regs-lcd.h>
32#include <mach/regs-sdi.h> 32#include <mach/regs-sdi.h>
33#include <plat/regs-s3c2412-iis.h>
34#include <plat/regs-iis.h> 33#include <plat/regs-iis.h>
35#include <plat/regs-spi.h> 34#include <plat/regs-spi.h>
36 35
@@ -119,13 +118,11 @@ static struct s3c24xx_dma_map __initdata s3c2412_dma_mappings[] = {
119 .name = "i2s-sdi", 118 .name = "i2s-sdi",
120 .channels = MAP(S3C2412_DMAREQSEL_I2SRX), 119 .channels = MAP(S3C2412_DMAREQSEL_I2SRX),
121 .channels_rx = MAP(S3C2412_DMAREQSEL_I2SRX), 120 .channels_rx = MAP(S3C2412_DMAREQSEL_I2SRX),
122 .hw_addr.from = S3C2410_PA_IIS + S3C2412_IISRXD,
123 }, 121 },
124 [DMACH_I2S_OUT] = { 122 [DMACH_I2S_OUT] = {
125 .name = "i2s-sdo", 123 .name = "i2s-sdo",
126 .channels = MAP(S3C2412_DMAREQSEL_I2STX), 124 .channels = MAP(S3C2412_DMAREQSEL_I2STX),
127 .channels_rx = MAP(S3C2412_DMAREQSEL_I2STX), 125 .channels_rx = MAP(S3C2412_DMAREQSEL_I2STX),
128 .hw_addr.to = S3C2410_PA_IIS + S3C2412_IISTXD,
129 }, 126 },
130 [DMACH_USB_EP1] = { 127 [DMACH_USB_EP1] = {
131 .name = "usb-ep1", 128 .name = "usb-ep1",