diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2014-06-20 08:37:41 -0400 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-07-15 05:02:29 -0400 |
| commit | 0cdbee33ea42bfd5f61f824e258a1a0944dd2a27 (patch) | |
| tree | 414805d4d548311de2d72b89baf5286a282289c3 | |
| parent | 28564f0893750f52085744d5d5728fc7631eefb6 (diff) | |
dmaengine: shdma: Use defines instead of hardcoded numbers
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| -rw-r--r-- | drivers/dma/sh/shdma-arm.h | 4 | ||||
| -rw-r--r-- | drivers/dma/sh/shdmac.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/dma/sh/shdma-arm.h b/drivers/dma/sh/shdma-arm.h index a2b8258426c9..a1b0ef45d6a2 100644 --- a/drivers/dma/sh/shdma-arm.h +++ b/drivers/dma/sh/shdma-arm.h | |||
| @@ -45,7 +45,7 @@ enum { | |||
| 45 | ((((i) & TS_LOW_BIT) << TS_LOW_SHIFT) |\ | 45 | ((((i) & TS_LOW_BIT) << TS_LOW_SHIFT) |\ |
| 46 | (((i) & TS_HI_BIT) << TS_HI_SHIFT)) | 46 | (((i) & TS_HI_BIT) << TS_HI_SHIFT)) |
| 47 | 47 | ||
| 48 | #define CHCR_TX(xmit_sz) (DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL((xmit_sz))) | 48 | #define CHCR_TX(xmit_sz) (DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL((xmit_sz))) |
| 49 | #define CHCR_RX(xmit_sz) (DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL((xmit_sz))) | 49 | #define CHCR_RX(xmit_sz) (DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL((xmit_sz))) |
| 50 | 50 | ||
| 51 | #endif | 51 | #endif |
diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c index 1a6f6595c6c1..58eb85770eba 100644 --- a/drivers/dma/sh/shdmac.c +++ b/drivers/dma/sh/shdmac.c | |||
| @@ -239,9 +239,8 @@ static void dmae_init(struct sh_dmae_chan *sh_chan) | |||
| 239 | { | 239 | { |
| 240 | /* | 240 | /* |
| 241 | * Default configuration for dual address memory-memory transfer. | 241 | * Default configuration for dual address memory-memory transfer. |
| 242 | * 0x400 represents auto-request. | ||
| 243 | */ | 242 | */ |
| 244 | u32 chcr = DM_INC | SM_INC | 0x400 | log2size_to_chcr(sh_chan, | 243 | u32 chcr = DM_INC | SM_INC | RS_AUTO | log2size_to_chcr(sh_chan, |
| 245 | LOG2_DEFAULT_XFER_SIZE); | 244 | LOG2_DEFAULT_XFER_SIZE); |
| 246 | sh_chan->xmit_shift = calc_xmit_shift(sh_chan, chcr); | 245 | sh_chan->xmit_shift = calc_xmit_shift(sh_chan, chcr); |
| 247 | chcr_write(sh_chan, chcr); | 246 | chcr_write(sh_chan, chcr); |
