diff options
| -rw-r--r-- | arch/arm/include/asm/hardware/pl080.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-s3c64xx/dma.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/Kconfig | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/include/asm/hardware/pl080.h b/arch/arm/include/asm/hardware/pl080.h index 6a6c66be7f65..f35b86e68dd5 100644 --- a/arch/arm/include/asm/hardware/pl080.h +++ b/arch/arm/include/asm/hardware/pl080.h | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | 43 | ||
| 44 | /* Per channel configuration registers */ | 44 | /* Per channel configuration registers */ |
| 45 | 45 | ||
| 46 | #define PL008_Cx_STRIDE (0x20) | 46 | #define PL080_Cx_STRIDE (0x20) |
| 47 | #define PL080_Cx_BASE(x) ((0x100 + (x * 0x20))) | 47 | #define PL080_Cx_BASE(x) ((0x100 + (x * 0x20))) |
| 48 | #define PL080_Cx_SRC_ADDR(x) ((0x100 + (x * 0x20))) | 48 | #define PL080_Cx_SRC_ADDR(x) ((0x100 + (x * 0x20))) |
| 49 | #define PL080_Cx_DST_ADDR(x) ((0x104 + (x * 0x20))) | 49 | #define PL080_Cx_DST_ADDR(x) ((0x104 + (x * 0x20))) |
| @@ -68,6 +68,8 @@ | |||
| 68 | #define PL080_CONTROL_TC_IRQ_EN (1 << 31) | 68 | #define PL080_CONTROL_TC_IRQ_EN (1 << 31) |
| 69 | #define PL080_CONTROL_PROT_MASK (0x7 << 28) | 69 | #define PL080_CONTROL_PROT_MASK (0x7 << 28) |
| 70 | #define PL080_CONTROL_PROT_SHIFT (28) | 70 | #define PL080_CONTROL_PROT_SHIFT (28) |
| 71 | #define PL080_CONTROL_PROT_CACHE (1 << 30) | ||
| 72 | #define PL080_CONTROL_PROT_BUFF (1 << 29) | ||
| 71 | #define PL080_CONTROL_PROT_SYS (1 << 28) | 73 | #define PL080_CONTROL_PROT_SYS (1 << 28) |
| 72 | #define PL080_CONTROL_DST_INCR (1 << 27) | 74 | #define PL080_CONTROL_DST_INCR (1 << 27) |
| 73 | #define PL080_CONTROL_SRC_INCR (1 << 26) | 75 | #define PL080_CONTROL_SRC_INCR (1 << 26) |
diff --git a/arch/arm/mach-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c index 5567e037b0d1..e7d03ab41d80 100644 --- a/arch/arm/mach-s3c64xx/dma.c +++ b/arch/arm/mach-s3c64xx/dma.c | |||
| @@ -697,7 +697,7 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase, | |||
| 697 | chptr->number = chno; | 697 | chptr->number = chno; |
| 698 | chptr->dmac = dmac; | 698 | chptr->dmac = dmac; |
| 699 | chptr->regs = regptr; | 699 | chptr->regs = regptr; |
| 700 | regptr += PL008_Cx_STRIDE; | 700 | regptr += PL080_Cx_STRIDE; |
| 701 | } | 701 | } |
| 702 | 702 | ||
| 703 | /* for the moment, permanently enable the controller */ | 703 | /* for the moment, permanently enable the controller */ |
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 2753fb3e4f73..3a9ab0be5def 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | config PLAT_SAMSUNG | 7 | config PLAT_SAMSUNG |
| 8 | bool | 8 | bool |
| 9 | depends on ARCH_S3C2410 || ARCH_S3C24A0 || ARCH_S3C64XX | 9 | depends on PLAT_S3C24XX || ARCH_S3C64XX || PLAT_S5P |
| 10 | select NO_IOPORT | 10 | select NO_IOPORT |
| 11 | default y | 11 | default y |
| 12 | help | 12 | help |
