| Message ID | 1407244889-26655-1-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Tue, Aug 05, 2014 at 03:21:29PM +0200, Geert Uytterhoeven wrote: > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > Commit 6b32fafee2bb5fcf0b3d3d04a9762d3a0212089e ("dmaengine: shdma: Add > more register documentation") has landed in > git://git.infradead.org/users/vkoul/slave-dma.git#next > > arch/arm/mach-shmobile/dma-register.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Thanks, I have queued this up for v3.18. -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-shmobile/dma-register.h b/arch/arm/mach-shmobile/dma-register.h index 97c40bd9b94f..52a2f66e600f 100644 --- a/arch/arm/mach-shmobile/dma-register.h +++ b/arch/arm/mach-shmobile/dma-register.h @@ -52,8 +52,8 @@ static const unsigned int dma_ts_shift[] = { ((((i) & TS_LOW_BIT) << TS_LOW_SHIFT) |\ (((i) & TS_HI_BIT) << TS_HI_SHIFT)) -#define CHCR_TX(xmit_sz) (DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL((xmit_sz))) -#define CHCR_RX(xmit_sz) (DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL((xmit_sz))) +#define CHCR_TX(xmit_sz) (DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL((xmit_sz))) +#define CHCR_RX(xmit_sz) (DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL((xmit_sz))) /*
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- Commit 6b32fafee2bb5fcf0b3d3d04a9762d3a0212089e ("dmaengine: shdma: Add more register documentation") has landed in git://git.infradead.org/users/vkoul/slave-dma.git#next arch/arm/mach-shmobile/dma-register.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)