diff options
author | Tomasz Figa <tomasz.figa@gmail.com> | 2011-08-22 22:33:08 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-19 03:37:55 -0400 |
commit | 6d8d492ef73433ea8debfba623dc2ee4d627aa7e (patch) | |
tree | f4698dee0095266eb6841c7ac6e96d1e5ca5bec6 /arch | |
parent | 8c051ab47bf3e0d35636d4772f9c0504bebe2fec (diff) |
ARM: S3C64XX: Use S3C64XX_SDMA_SEL register name instead of numeric address
This patch adds a definition of S3C64XX_SDMA_SEL register and modifies
the s3c64xx DMA driver to use it instead of a magic register address.
Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-s3c64xx/dma.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/regs-sys.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c index 204bfafe4bfc..0849f2d3b105 100644 --- a/arch/arm/mach-s3c64xx/dma.c +++ b/arch/arm/mach-s3c64xx/dma.c | |||
@@ -740,7 +740,7 @@ static int __init s3c64xx_dma_init(void) | |||
740 | } | 740 | } |
741 | 741 | ||
742 | /* Set all DMA configuration to be DMA, not SDMA */ | 742 | /* Set all DMA configuration to be DMA, not SDMA */ |
743 | writel(0xffffff, S3C_SYSREG(0x110)); | 743 | writel(0xffffff, S3C64XX_SDMA_SEL); |
744 | 744 | ||
745 | /* Register standard DMA controllers */ | 745 | /* Register standard DMA controllers */ |
746 | s3c64xx_dma_init1(0, DMACH_UART0, IRQ_DMA0, 0x75000000); | 746 | s3c64xx_dma_init1(0, DMACH_UART0, IRQ_DMA0, 0x75000000); |
diff --git a/arch/arm/mach-s3c64xx/include/mach/regs-sys.h b/arch/arm/mach-s3c64xx/include/mach/regs-sys.h index 69b78d9f83b8..774e0de31400 100644 --- a/arch/arm/mach-s3c64xx/include/mach/regs-sys.h +++ b/arch/arm/mach-s3c64xx/include/mach/regs-sys.h | |||
@@ -21,6 +21,8 @@ | |||
21 | #define S3C64XX_AHB_CON1 S3C_SYSREG(0x104) | 21 | #define S3C64XX_AHB_CON1 S3C_SYSREG(0x104) |
22 | #define S3C64XX_AHB_CON2 S3C_SYSREG(0x108) | 22 | #define S3C64XX_AHB_CON2 S3C_SYSREG(0x108) |
23 | 23 | ||
24 | #define S3C64XX_SDMA_SEL S3C_SYSREG(0x110) | ||
25 | |||
24 | #define S3C64XX_OTHERS S3C_SYSREG(0x900) | 26 | #define S3C64XX_OTHERS S3C_SYSREG(0x900) |
25 | 27 | ||
26 | #define S3C64XX_OTHERS_USBMASK (1 << 16) | 28 | #define S3C64XX_OTHERS_USBMASK (1 << 16) |