summaryrefslogtreecommitdiffstats
path: root/include/linux/amba
diff options
context:
space:
mode:
authorRussell King - ARM Linux <linux@arm.linux.org.uk>2011-01-03 22:39:33 +0000
committerDan Williams <dan.j.williams@intel.com>2011-01-04 19:16:12 -0800
commit4983a04fd2562986360b646b378f267308bc22c0 (patch)
tree365b9fcfe69547f27dc1593565a07ad0465bf37c /include/linux/amba
parent19524d77ec34faf58d313ba34fb755ef6e159216 (diff)
downloadop-kernel-dev-4983a04fd2562986360b646b378f267308bc22c0.zip
op-kernel-dev-4983a04fd2562986360b646b378f267308bc22c0.tar.gz
ARM: PL08x: move ccfg into txd structure
The ccfg register is used to configure the channel parameters - the type and direction of transfer, the flow control signal and IRQ mask enables. The type and direction of transfer is known in the relevent prep_* function where a txd is created. The IRQ mask enables are always set, and the flow control signals are always set when we start processing a txd according to phychan->signal. If we store the ccfg value in the txd structure, we can avoid modifying platform data - and even having it in platform data at all. So, remove it from platform data too. 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/linux/amba')
-rw-r--r--include/linux/amba/pl08x.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/amba/pl08x.h b/include/linux/amba/pl08x.h
index 29d9745..8e74cb1 100644
--- a/include/linux/amba/pl08x.h
+++ b/include/linux/amba/pl08x.h
@@ -58,7 +58,6 @@ struct pl08x_channel_data {
int max_signal;
u32 muxval;
u32 cctl;
- u32 ccfg;
dma_addr_t addr;
bool circular_buffer;
bool single;
@@ -113,6 +112,11 @@ struct pl08x_txd {
void *llis_va;
struct pl08x_channel_data *cd;
bool active;
+ /*
+ * Settings to be put into the physical channel when we
+ * trigger this txd. Other registers are in llis_va[0].
+ */
+ u32 ccfg;
};
/**
OpenPOWER on IntegriCloud