summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-01-21 15:11:53 +0100
committerDan Williams <dan.j.williams@intel.com>2011-01-30 08:10:55 +0100
commitf301c062dcdd113bc977ae1ebc8c12232f8531a9 (patch)
treed4e4e7a79d7121e9d4e49b87146e10641888a203 /include
parentdmaengine/dw_dmac: don't scan descriptors if no xfers in progress (diff)
downloadlinux-f301c062dcdd113bc977ae1ebc8c12232f8531a9.tar.xz
linux-f301c062dcdd113bc977ae1ebc8c12232f8531a9.zip
dmaengine/dw_dmac: allow src/dst masters to be configured at runtime
Some platforms have flexible mastering capabilities and this needs to be selected at runtime. If the platform has specified private data in the form of the dw_dma_slave then fetch the source and destination masters from here. If this isn't present, default to the previous of 0 and 1. v2: cleanup whitespace Acked-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> Signed-off-by: Jamie Iles <jamie.iles@picochip.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/dw_dmac.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/dw_dmac.h b/include/linux/dw_dmac.h
index c8aad713a046..8014eb81054d 100644
--- a/include/linux/dw_dmac.h
+++ b/include/linux/dw_dmac.h
@@ -52,6 +52,8 @@ struct dw_dma_slave {
enum dw_dma_slave_width reg_width;
u32 cfg_hi;
u32 cfg_lo;
+ int src_master;
+ int dst_master;
};
/* Platform-configurable bits in CFG_HI */