diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-05-16 13:20:55 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-07-01 15:15:48 +0200 |
| commit | dc8d5f8de12146c8732d926a30e5f064d76061e0 (patch) | |
| tree | a44e7117da81c14d86fda0aefca77c8b9a7537d7 /include | |
| parent | dmaengine: PL08x: ignore 'direction' argument in dma_slave_config (diff) | |
| download | linux-dc8d5f8de12146c8732d926a30e5f064d76061e0.tar.xz linux-dc8d5f8de12146c8732d926a30e5f064d76061e0.zip | |
dmaengine: PL08x: get rid of unnecessary checks in dma_slave_config
Get rid of the unnecessary checks in dma_slave_config utilizing
the DMA direction. This allows us to move the computation of
cctl to the prepare function.
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Tested-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/amba/pl08x.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/amba/pl08x.h b/include/linux/amba/pl08x.h index 158ce2634b01..2a5f64a11b77 100644 --- a/include/linux/amba/pl08x.h +++ b/include/linux/amba/pl08x.h @@ -47,7 +47,8 @@ enum { * devices with static assignments * @muxval: a number usually used to poke into some mux regiser to * mux in the signal to this channel - * @cctl_opt: default options for the channel control register + * @cctl_memcpy: options for the channel control register for memcpy + * *** not used for slave channels *** * @addr: source/target address in physical memory for this DMA channel, * can be the address of a FIFO register for burst requests for example. * This can be left undefined if the PrimeCell API is used for configuring @@ -62,7 +63,7 @@ struct pl08x_channel_data { int min_signal; int max_signal; u32 muxval; - u32 cctl; + u32 cctl_memcpy; dma_addr_t addr; bool single; u8 periph_buses; |