diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2007-12-22 21:09:40 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-01-28 08:20:49 -0500 |
| commit | d45c30cb4c0b5f5555397ba2e942d63b4170fa1f (patch) | |
| tree | 1708f7026fb5e5c7cc90a439c800a6c5f7395566 | |
| parent | 71e5b2f154eb743d609bb4e743ea344596769911 (diff) | |
[ARM] 4725/1: S3C2412: Fix IIS and SDI definitions in DMA map
The IIS and SDI register hw_addr definitions are
incorrect in the DMA map for the S3C2412.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-s3c2412/dma.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2412/dma.c b/arch/arm/mach-s3c2412/dma.c index 53c1d5bbce19..c9cd51439126 100644 --- a/arch/arm/mach-s3c2412/dma.c +++ b/arch/arm/mach-s3c2412/dma.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <asm/arch/regs-mem.h> | 30 | #include <asm/arch/regs-mem.h> |
| 31 | #include <asm/arch/regs-lcd.h> | 31 | #include <asm/arch/regs-lcd.h> |
| 32 | #include <asm/arch/regs-sdi.h> | 32 | #include <asm/arch/regs-sdi.h> |
| 33 | #include <asm/plat-s3c24xx/regs-s3c2412-iis.h> | ||
| 33 | #include <asm/plat-s3c24xx/regs-iis.h> | 34 | #include <asm/plat-s3c24xx/regs-iis.h> |
| 34 | #include <asm/plat-s3c24xx/regs-spi.h> | 35 | #include <asm/plat-s3c24xx/regs-spi.h> |
| 35 | 36 | ||
| @@ -47,8 +48,8 @@ static struct s3c24xx_dma_map __initdata s3c2412_dma_mappings[] = { | |||
| 47 | [DMACH_SDI] = { | 48 | [DMACH_SDI] = { |
| 48 | .name = "sdi", | 49 | .name = "sdi", |
| 49 | .channels = MAP(S3C2412_DMAREQSEL_SDI), | 50 | .channels = MAP(S3C2412_DMAREQSEL_SDI), |
| 50 | .hw_addr.to = S3C2410_PA_IIS + S3C2410_IISFIFO, | 51 | .hw_addr.to = S3C2410_PA_SDI + S3C2410_SDIDATA, |
| 51 | .hw_addr.from = S3C2410_PA_IIS + S3C2410_IISFIFO, | 52 | .hw_addr.from = S3C2410_PA_SDI + S3C2410_SDIDATA, |
| 52 | }, | 53 | }, |
| 53 | [DMACH_SPI0] = { | 54 | [DMACH_SPI0] = { |
| 54 | .name = "spi0", | 55 | .name = "spi0", |
| @@ -105,12 +106,12 @@ static struct s3c24xx_dma_map __initdata s3c2412_dma_mappings[] = { | |||
| 105 | [DMACH_I2S_IN] = { | 106 | [DMACH_I2S_IN] = { |
| 106 | .name = "i2s-sdi", | 107 | .name = "i2s-sdi", |
| 107 | .channels = MAP(S3C2412_DMAREQSEL_I2SRX), | 108 | .channels = MAP(S3C2412_DMAREQSEL_I2SRX), |
| 108 | .hw_addr.from = S3C2410_PA_IIS + S3C2410_IISFIFO, | 109 | .hw_addr.from = S3C2410_PA_IIS + S3C2412_IISRXD, |
| 109 | }, | 110 | }, |
| 110 | [DMACH_I2S_OUT] = { | 111 | [DMACH_I2S_OUT] = { |
| 111 | .name = "i2s-sdo", | 112 | .name = "i2s-sdo", |
| 112 | .channels = MAP(S3C2412_DMAREQSEL_I2STX), | 113 | .channels = MAP(S3C2412_DMAREQSEL_I2STX), |
| 113 | .hw_addr.to = S3C2410_PA_IIS + S3C2410_IISFIFO, | 114 | .hw_addr.to = S3C2410_PA_IIS + S3C2412_IISTXD, |
| 114 | }, | 115 | }, |
| 115 | [DMACH_USB_EP1] = { | 116 | [DMACH_USB_EP1] = { |
| 116 | .name = "usb-ep1", | 117 | .name = "usb-ep1", |
