diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2010-04-21 17:14:19 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 09:02:09 +0200 |
| commit | c2fe3092e5b85c8c65ebac88a3ffa4355e51a9b6 (patch) | |
| tree | b000864a48f0880b6b9afaf7b7cbdc672100cdb3 /arch/sh/include/cpu-sh4 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-c2fe3092e5b85c8c65ebac88a3ffa4355e51a9b6.tar.xz linux-c2fe3092e5b85c8c65ebac88a3ffa4355e51a9b6.zip | |
SH: fix TS field shift calculation for DMA drivers
CHCR_TS_HIGH_SHIFT is defined as a shift of TS high bits in CHCR register,
relative to low bits. The TS_INDEX2VAL() macro has to take this into account.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include/cpu-sh4')
| -rw-r--r-- | arch/sh/include/cpu-sh4/cpu/dma-register.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/cpu-sh4/cpu/dma-register.h b/arch/sh/include/cpu-sh4/cpu/dma-register.h index 55f9fec082d4..de2359533994 100644 --- a/arch/sh/include/cpu-sh4/cpu/dma-register.h +++ b/arch/sh/include/cpu-sh4/cpu/dma-register.h @@ -76,7 +76,7 @@ enum { } #define TS_INDEX2VAL(i) ((((i) & 3) << CHCR_TS_LOW_SHIFT) | \ - ((((i) >> 2) & 3) << CHCR_TS_HIGH_SHIFT)) + (((i) & 0xc) << CHCR_TS_HIGH_SHIFT)) #else /* CONFIG_CPU_SH4A */ |