* [PATCH resend] ARM: shmobile: dma: Use defines instead of hardcoded numbers
@ 2014-08-05 13:21 Geert Uytterhoeven
2014-08-06 0:51 ` Simon Horman
0 siblings, 1 reply; 2+ messages in thread
From: Geert Uytterhoeven @ 2014-08-05 13:21 UTC (permalink / raw)
To: linux-sh
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(-)
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)))
/*
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH resend] ARM: shmobile: dma: Use defines instead of hardcoded numbers
2014-08-05 13:21 [PATCH resend] ARM: shmobile: dma: Use defines instead of hardcoded numbers Geert Uytterhoeven
@ 2014-08-06 0:51 ` Simon Horman
0 siblings, 0 replies; 2+ messages in thread
From: Simon Horman @ 2014-08-06 0:51 UTC (permalink / raw)
To: linux-sh
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-08-06 0:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-05 13:21 [PATCH resend] ARM: shmobile: dma: Use defines instead of hardcoded numbers Geert Uytterhoeven
2014-08-06 0:51 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).