diff options
| author | Russell King - ARM Linux <linux@arm.linux.org.uk> | 2011-01-03 17:39:13 -0500 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-01-04 22:16:12 -0500 |
| commit | 19524d77ec34faf58d313ba34fb755ef6e159216 (patch) | |
| tree | 63b24d5a82de3ee5fd8e07a311eb8d573cd21f76 /include | |
| parent | c885bee4f10323a1ff3f19e1aa2aa6f4e7f89dd8 (diff) | |
ARM: PL08x: avoid duplicating registers in txd and phychan structures
As we now have all the code accessing the phychan {csrc,cdst,clli,cctl,
ccfg} members in one function, there's no point storing the data into
the struct. Get rid of the struct members. Re-order the register dump
in the dev_dbg() to reflect the order we write the registers to the DMA
device.
The txd {csrc,cdst,clli,cctl} values are duplicates of the lli[0]
values, so there's no point duplicating these either. Program the DMAC
registers directly from the lli[0] values.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/amba/pl08x.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/include/linux/amba/pl08x.h b/include/linux/amba/pl08x.h index 2c834ed5f41f..29d974562df9 100644 --- a/include/linux/amba/pl08x.h +++ b/include/linux/amba/pl08x.h | |||
| @@ -95,11 +95,6 @@ struct pl08x_phy_chan { | |||
| 95 | spinlock_t lock; | 95 | spinlock_t lock; |
| 96 | int signal; | 96 | int signal; |
| 97 | struct pl08x_dma_chan *serving; | 97 | struct pl08x_dma_chan *serving; |
| 98 | u32 csrc; | ||
| 99 | u32 cdst; | ||
| 100 | u32 clli; | ||
| 101 | u32 cctl; | ||
| 102 | u32 ccfg; | ||
| 103 | }; | 98 | }; |
| 104 | 99 | ||
| 105 | /** | 100 | /** |
| @@ -118,14 +113,6 @@ struct pl08x_txd { | |||
| 118 | void *llis_va; | 113 | void *llis_va; |
| 119 | struct pl08x_channel_data *cd; | 114 | struct pl08x_channel_data *cd; |
| 120 | bool active; | 115 | bool active; |
| 121 | /* | ||
| 122 | * Settings to be put into the physical channel when we | ||
| 123 | * trigger this txd | ||
| 124 | */ | ||
| 125 | u32 csrc; | ||
| 126 | u32 cdst; | ||
| 127 | u32 clli; | ||
| 128 | u32 cctl; | ||
| 129 | }; | 116 | }; |
| 130 | 117 | ||
| 131 | /** | 118 | /** |
