diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-05-16 07:20:55 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-07-01 09:15:48 -0400 |
commit | dc8d5f8de12146c8732d926a30e5f064d76061e0 (patch) | |
tree | a44e7117da81c14d86fda0aefca77c8b9a7537d7 /include/linux/amba | |
parent | 800d683e6b8f0ba630470a56b61ff6742ad129ad (diff) |
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/linux/amba')
-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 { | |||
47 | * devices with static assignments | 47 | * devices with static assignments |
48 | * @muxval: a number usually used to poke into some mux regiser to | 48 | * @muxval: a number usually used to poke into some mux regiser to |
49 | * mux in the signal to this channel | 49 | * mux in the signal to this channel |
50 | * @cctl_opt: default options for the channel control register | 50 | * @cctl_memcpy: options for the channel control register for memcpy |
51 | * *** not used for slave channels *** | ||
51 | * @addr: source/target address in physical memory for this DMA channel, | 52 | * @addr: source/target address in physical memory for this DMA channel, |
52 | * can be the address of a FIFO register for burst requests for example. | 53 | * can be the address of a FIFO register for burst requests for example. |
53 | * This can be left undefined if the PrimeCell API is used for configuring | 54 | * This can be left undefined if the PrimeCell API is used for configuring |
@@ -62,7 +63,7 @@ struct pl08x_channel_data { | |||
62 | int min_signal; | 63 | int min_signal; |
63 | int max_signal; | 64 | int max_signal; |
64 | u32 muxval; | 65 | u32 muxval; |
65 | u32 cctl; | 66 | u32 cctl_memcpy; |
66 | dma_addr_t addr; | 67 | dma_addr_t addr; |
67 | bool single; | 68 | bool single; |
68 | u8 periph_buses; | 69 | u8 periph_buses; |